tree 0ccb706f57a1b61d8ece50a978227abe8b192ed9
parent b9d913abc51d53cc6c61383eb0d35b34fc9b1e5d
parent 0f7d5a6b1ea256d2b68a006e246fc28970c25df5
author The Android Open Source Project <initial-contribution@android.com> 1355181562 -0800
committer The Android Open Source Project <initial-contribution@android.com> 1355181562 -0800

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

Change-Id: I89a74a8a7673ea15625a79c5d9c5f7b111276ec3