am ffeb2959: am 036cb573: am 3f468007: Merge "Protect against lack of WRITE_SYSTEM_SETTINGS AppOp" into mnc-dev

* commit 'ffeb2959e177a7f94321ca9ca3b3e55726fd7df2':
  Protect against lack of WRITE_SYSTEM_SETTINGS AppOp
tree: f27d1abd8bb6e57306bcc632ae09606a9cbc166d
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. proguard.flags