tree 574c18cf1ed73a748afb810d449bec5a9598e356
parent b778fdff3d9d9b7b272ba8b52f68f991b3269110
parent 5a6204880d2fd98a0f887741186ca5f3d16526f7
author Yorke Lee <yorkelee@google.com> 1436980121 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1436980121 +0000

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

* commit '5a6204880d2fd98a0f887741186ca5f3d16526f7':
  Update/add strings for permissions UI changes