tree 6a45200d53f55e3dfbb51b12c30d0429ab31504b
parent d2f6ad6d50b5570327f8cca3b2d2bdcaec36ea90
parent 29f419a9e8c5676e2a1a1a7da41e59eca3827f75
parent 29f419a9e8c5676e2a1a1a7da41e59eca3827f75
author The Android Open Source Project <initial-contribution@android.com> 1352233133 -0800
committer The Android Open Source Project <initial-contribution@android.com> 1352233133 -0800

Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge

Change-Id: I8819d77d2cd0f33d9f4e5553a5b2d4639fe4ec47