tree 8924d31ff2ecb8b544ab35dab62f515aac397156
parent f51a45960848ed55f92ded99734acb33588d1918
parent 33fc242ecbb438b5dab70a2c97a06d0816d6ccd9
author Yorke Lee <yorkelee@google.com> 1440674472 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1440674472 +0000

am 33fc242e: (-s ours) am 5a620488: Merge "Update/add strings for permissions UI changes" into mnc-dev

* commit '33fc242ecbb438b5dab70a2c97a06d0816d6ccd9':