tree 6fb727ccda1a7478567c1be879721b2c5addab07
parent fcd1a41fd206043359b026d7130807dd4579b4f8
parent a795ab8568293b45b8687398bb91ba906a264c19
author The Android Open Source Project <initial-contribution@android.com> 1352233633 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1352233633 -0800

am a795ab85: am c39ee474: Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge

* commit 'a795ab8568293b45b8687398bb91ba906a264c19':