[automerger skipped] DO NOT MERGE: Chassify Car Settings am: 60983847f9 -s ours am: d06455c75a

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