tree ce1eb6a0ff628d16623186b92e99ecc48e752a20
parent 8c063cfcff569e7d68b7405c5b25caba8ce02549
parent 7bd31959b18aa609a2272dfb3e6678f43a90a661
author The Android Open Source Project <initial-contribution@android.com> 1349793341 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1349793341 -0700

am 7bd31959: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '7bd31959b18aa609a2272dfb3e6678f43a90a661':