am 30b849b5: am 33fc242e: (-s ours) am 5a620488: Merge "Update/add strings for permissions UI changes" into mnc-dev

* commit '30b849b503cce8e6e905ca94fa24f312c6823b37':
tree: 84230245b6d0620425180d5fab12ff558de999ab
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. proguard.flags