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

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