tree 114547bda52cd6c451ce56564f91c04e5b5fa747
parent 12f0182dd13849adae355e08a8655b5390a1dee4
parent 1c4e21b447cf0d71dfc6a44419de778c135d7834
author Cole Faust <colefaust@google.com> 1598305201 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1598305201 +0000

[automerger skipped] Fix auto-generate-resources.py am: 1c4e21b447 -s ours

am skip reason: Change-Id I4ef7375b555e64ac10f1ec82c8601601d0493c4a with SHA-1 50a51d6dfc is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Car/libs/+/12435967

Change-Id: I7b488fa3af18afa808a2c83637d8308d369293e7