tree 2432aee3e69979303ae430b6c6644588f826332b
parent 7081ee5d7b1d6312e1bfd08c069f648ada6a266f
parent ca64e0c00bbc70dde3ff7c179890fa9c94144b26
author The Android Open Source Project <initial-contribution@android.com> 1366738402 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1366738402 -0700

am a8c57e11: am b69b416c: am 17876646: am 218ea026: Reconcile with jb-release

* commit 'a8c57e1172dd6a7184d7c2883879730e48654318':