Merge "Update/add strings for permissions UI changes" into mnc-dev
tree: 9d943ab57a610f20b58903a148ed8d03a5215057
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. proguard.flags