tree d708a0f0d49c62de4ec342904b31173d3a26fc6c
parent 1f1d0235fed769c4277d9da072a270addd1854d6
parent 8bebe981e5a347a6f99d6916f689fcaf9cd29c8f
author The Android Open Source Project <initial-contribution@android.com> 1352234040 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1352234040 -0800

am 8bebe981: (-s ours) am c6102390: am 209cdc3b: Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge

* commit '8bebe981e5a347a6f99d6916f689fcaf9cd29c8f':