Merge "DO NOT MERGE Standardize the use of Grant Admin Permissions" into pi-car-dev
tree: cf4abd560112e5a1722ac33c090cb7e37e209354
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. PREUPLOAD.cfg