am d4b954f4: am caee73d3: (-s ours) am 3f468007: Merge "Protect against lack of WRITE_SYSTEM_SETTINGS AppOp" into mnc-dev

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