tree acfc8b558580f0421840af5f9e94b328e18c1a90
parent 20a08cc9916a2a65a557f533a6bdc2878b1bddef
parent 188bd32cb36757ca2a007b66becdaf31abed41af
author The Android Open Source Project <initial-contribution@android.com> 1352233624 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1352233624 -0800

am 188bd32c: Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge

* commit '188bd32cb36757ca2a007b66becdaf31abed41af':