tree 1be23cf507df317658c138a870b562ae0edcdf31
parent 1781c1eec98a9d48157a49ba629405313d4850a0
parent 23ab200c16923e97e502b282408eb1ed970b3cb1
author The Android Open Source Project <initial-contribution@android.com> 1345904283 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1345904285 -0700

Reconcile with jb-mr1-release - do not merge

Change-Id: Ib703906e995f252a62d61912627b584f4ad24e63