tree ecda00d7701fc24e070044d0cc46858eb91a884e
parent 0d54bc21d49ed11304e891fb079bcaf61b6bd4c6
parent 713fb9fd596c9c0e3c2021f7b1f69bec12a1e93d
author The Android Open Source Project <initial-contribution@android.com> 1354563407 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1354563407 -0800

am 713fb9fd: (-s ours) Reconcile with jb-mr1.1-release - do not merge

* commit '713fb9fd596c9c0e3c2021f7b1f69bec12a1e93d':