tree 178854b2917d9d46c37533ad3066a1d53ff650dd
parent a4920fdb7aa51f502b7cfd56c50e7947e2cd8e8f
parent 5e6d24e84c7886ccbe345d501159d7e7b0ceb2fb
author The Android Open Source Project <initial-contribution@android.com> 1349968092 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1349968092 -0700

am 5e6d24e8: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '5e6d24e84c7886ccbe345d501159d7e7b0ceb2fb':