tree e695f0dfa1dafb3978144842eb29066534d0c003
parent ea4d950e9d2cfbb06fde1ccb6ddada5adb0a726e
parent 8b6ce0a269ba67995766980f5b83937302143e64
author The Android Open Source Project <initial-contribution@android.com> 1351866627 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1351866627 -0700

am 8b6ce0a2: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '8b6ce0a269ba67995766980f5b83937302143e64':