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

* commit '55fcb21595a4702029eb5695862ca2726f248649':
  Update/add strings for permissions UI changes
tree: 17482286dd8c3b2b5425aa7d972bb3821c1cb0c0
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. proguard.flags