tree 83bb73c48a438b0384d30fe9f5ad704c607be740
parent 12355b83c1f6c1d01d5bc8304fa48e7f7a8e6efd
author Jae Seo <jaeseo@google.com> 1442020776 -0700
committer Dongwon Kang <dwkang@google.com> 1444719331 +0000

DO NOT MERGE: Change permission strings to comply with the system permission UI

Bug: 24776049
Change-Id: I53b57643d23f50c3bbf03889c4ef1ce420c13b34
(cherry picked from commit 0a3cf4371c83f1e3abe5993bccae78dd27ca6027)