tree 84230245b6d0620425180d5fab12ff558de999ab
parent 76f98256ca662b9ef314dda89a076e3ad12a7da4
parent 30b849b503cce8e6e905ca94fa24f312c6823b37
author Yorke Lee <yorkelee@google.com> 1440685100 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1440685100 +0000

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

* commit '30b849b503cce8e6e905ca94fa24f312c6823b37':