tree 1292a837f2efe3c144d137302f2e4e45e7655cfb
parent 4e18fb99c8db3ef6b68df18dbcec6c5313c82470
parent 122d3fba8d2d64fa641d04d23fcf51f5f97c9edf
author Yorke Lee <yorkelee@google.com> 1436981656 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1436981656 +0000

am 122d3fba: am 55fcb215: am 5a620488: Merge "Update/add strings for permissions UI changes" into mnc-dev

* commit '122d3fba8d2d64fa641d04d23fcf51f5f97c9edf':
  Update/add strings for permissions UI changes