tree 5fcb94764c3e99acdc2f28f945a400e1d4660af8
parent 04769f324f2945e11bdf35816fe53f385e3ff6fb
parent c6102390c6f2f7228326913e4d2e7598fbdd596a
author The Android Open Source Project <initial-contribution@android.com> 1352233794 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1352233794 -0800

am c6102390: am 209cdc3b: Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge

* commit 'c6102390c6f2f7228326913e4d2e7598fbdd596a':