tree a04667a27b2b2a212cf6326179b9583355b53edb
parent b1282d252890d7626b096052f3c790da3978f689
parent 2239fdaf0c71972dee43c16b3a7ef24117ce2488
author The Android Open Source Project <initial-contribution@android.com> 1354734549 -0800
committer The Android Open Source Project <initial-contribution@android.com> 1354734549 -0800

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

Change-Id: I96b5e5f099cf83fa1cde97e286cabe2ddbe5f97c