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

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