tree 8c76130f705e0cae32e1285b0159eb6384c6ada9
parent 40ab92d002773012b6105fca077f7f28fb3c8804
parent 3f906009dbb20057c6f6f45069c32d078bd3d27f
author The Android Open Source Project <initial-contribution@android.com> 1361569176 -0800
committer The Android Open Source Project <initial-contribution@android.com> 1361569176 -0800

Reconcile with jb-mr1-release - do not merge

Change-Id: I652e19ace85b7b2be9c723b5ce1e7f36f7ae963f