tree 0ffa5ba512ec22b2af06a69524d0bf089b3074ae
parent bb7afa49893a68f2164c2b4e4708e2c21f30938f
parent 10b8e684e1945edfb60ec4391ac4c7f3d8bf4172
author The Android Open Source Project <initial-contribution@android.com> 1351700594 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1351700594 -0700

am 10b8e684: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '10b8e684e1945edfb60ec4391ac4c7f3d8bf4172':