Merge "DO NOT MERGE Additional assistant management settings screen" into pi-car-dev
tree: e7037fbfdc5ad50deb409946300162c0eb23b353
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. PREUPLOAD.cfg