tree b7764606ec9511b54a1adba75c491a92f31f24b0
parent 4fe053e1b406b41b5a60707523b389530619d953
parent 7c5109bef8c1f8b857b043bf9c1d26c2f0556e8f
author The Android Open Source Project <initial-contribution@android.com> 1345168753 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1345168753 -0700

am 7c5109be: (-s ours) Reconcile with jb-mr0-release - do not merge

* commit '7c5109bef8c1f8b857b043bf9c1d26c2f0556e8f':