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

* commit '15d59a6b8191677956ef528ac7a8b50c1e91aaee':
  Update/add strings for permissions UI changes
tree: 1292a837f2efe3c144d137302f2e4e45e7655cfb
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. proguard.flags