tree acfc8b558580f0421840af5f9e94b328e18c1a90
parent f01e18bc0de016254c4ae6592f790724edb2b449
parent 4caf0ebebbdd7514f4c12ae14b4cc537d504f20e
author The Android Open Source Project <initial-contribution@android.com> 1352233886 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1352233886 -0800

am 4caf0ebe: (-s ours) am 188bd32c: Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge

* commit '4caf0ebebbdd7514f4c12ae14b4cc537d504f20e':