tree e59e1814662a911315e045fe48f0e7b42eaf72c4
parent 85975f726ef2bb7ad27ba343fe2a87c02226b588
parent 9b2646b723af2dbca2faa2cfda8f6911e95b7895
author The Android Open Source Project <initial-contribution@android.com> 1354030998 -0800
committer The Android Open Source Project <initial-contribution@android.com> 1354030998 -0800

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

Change-Id: I735c4ab87f233912c203cac0f008ec115b9b1103