[automerger skipped] Merge "DO NOT MERGE Add directory access details page." into pi-car-dev am: 8e09be6aaf -s ours
am: c8449f4753

Change-Id: I406f4451eae1c6265a10327f932b519a0853125a
tree: d1ddf38cf5b401ab98cf4caa2ea92bf131bb50a9
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. PREUPLOAD.cfg