Merge "DO NOT MERGE Add PreferenceController for AppOps access." into pi-car-dev
tree: 4f5115f8959b30c3e90072ee1464689f72d298a6
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. PREUPLOAD.cfg