[automerger skipped] DO NOT MERGE: Chassify Car Settings am: 60983847f9 -s ours
am skip reason: subject contains skip directive

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