tree 4b825dc642cb6eb9a060e54bf8d69288fbee4904
parent 4f2a9ed40bd3e4cc20e37b11c2304448237bbd56
parent d8a35f525791964b55ed90a7f83f5c800b6eba2f
author Colin Cross <ccross@android.com> 1525725120 -0700
committer android-build-merger <android-build-merger@google.com> 1525725120 -0700

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

Change-Id: Id7a786b3ee5df875d4c9b2cad79f0234d9c8128e