tree 3c2e48cf17d2c513e2cdb0a7ab46d2f46cae7db9
parent c968999749e524a4beff985dca8c15ae2ecc6413
parent 2f4e38f0621586ed3b53ed0ad1827bffe18a1ff9
author The Android Open Source Project <initial-contribution@android.com> 1360101164 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1360101164 -0800

am 2f4e38f0: (-s ours) Reconcile with jb-mr1.1-release - do not merge

# Via The Android Automerger (1) and The Android Open Source Project (1)
* commit '2f4e38f0621586ed3b53ed0ad1827bffe18a1ff9':