tree 83e9e6f97177d8c0a079f6101c0a3e118fa16ecc
parent befe710322675487b22937c319448a1790e201a1
parent 6ba56c61966e32eb34d5b749c2774459f8e71f15
author The Android Open Source Project <initial-contribution@android.com> 1348506901 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1348506901 -0700

am 6ba56c61: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '6ba56c61966e32eb34d5b749c2774459f8e71f15':