tree ddee593d432336ad174f2f36bc4f92e200e3f35d
parent 0011777d54148dc84a923dda21b25f4f5a99ffed
parent da69f1c26bff1729331456db7e9c933bf82663d0
author The Android Open Source Project <initial-contribution@android.com> 1366048141 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1366048141 -0700

am da69f1c2: Reconcile with jb-mr2-release - do not merge

* commit 'da69f1c26bff1729331456db7e9c933bf82663d0':