tree 5fcb94764c3e99acdc2f28f945a400e1d4660af8
parent 8bebe981e5a347a6f99d6916f689fcaf9cd29c8f
parent 2a1f2bae93cde0b485c7122ba89007334b7a8d04
author The Android Open Source Project <initial-contribution@android.com> 1352234273 -0800
committer The Android Open Source Project <initial-contribution@android.com> 1352234274 -0800

Reconcile with jb-mr1.1-release - do not merge

Change-Id: I883abd23470b18df68c30b9307393b9b89ed0061