tree 9d943ab57a610f20b58903a148ed8d03a5215057
parent 624275b5ff31979a045a75eb0b4c2e3893b1ef4b
parent 2557d12aa9d13b2089f373936106fc44f53577c0
author Yorke Lee <yorkelee@google.com> 1436979543 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1436979543 +0000

Merge "Update/add strings for permissions UI changes" into mnc-dev