[automerger skipped] DO NOT MERGE: Chassify Car Settings am: 60983847f9 -s ours am: d06455c75a am: 9181d508b7 am: 1aa85d7079
am: dd9813b106 -s ours
am skip reason: subject contains skip directive

Change-Id: I7ddbf7fc77123a7234f6e04e3ce370093afde7c8
tree: 06ab0c8dd6ab946b775759d13006ef438d127caa
  1. res/
  2. src/
  3. tests/
  4. Android.bp
  5. AndroidManifest.xml
  6. PREUPLOAD.cfg