tree cbfc6c133e00bdc055cfa0a710842b79e7e8f965
parent 0804432bafeb10cd8e69d90f291777944c507995
parent b5dd100ad5fdbc6cedcba2c15c9f232ee2c6454e
author Aurimas Liutikas <aurimas@google.com> 1525725080 -0700
committer android-build-merger <android-build-merger@google.com> 1525725080 -0700

[automerger skipped] Migrate packages/apps/Car to aapt2 am: b7dbefb800
am: b5dd100ad5  -s ours

Change-Id: I3e600b2417638dd22b23d366fd9356e89e72239d