tree 1d9b87d5cdea24c258a6d6693d94bb4fac37293c
parent 13c9105bf5e796620ee223c47a4a24d4fbe39429
parent c05f6b399f76bec863be58d2943affd7e3d58461
author The Android Open Source Project <initial-contribution@android.com> 1344284291 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1344284292 -0700

Reconcile with jb-mr1-release - do not merge

Change-Id: I433aa27f430ba1c4555bdee52f239b3d8c81b47c