tree 41404459c1543025d32e586ad023d34e7de593d9
parent 7e48bb29597d8ef81bf36feda8891303e1f2f835
parent 3a714c2fa6cfd85c5a32ff64009f036d37e953d9
author Xin Li <delphij@google.com> 1598992613 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1598992613 +0000

[automerger skipped] Merge "Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)" into stage-aosp-master am: 3a714c2fa6 -s ours

am skip reason: Change-Id I026923360abee43c063ee7fb0f7557da8ffb8548 with SHA-1 c93a74b0ae is in history

Original change: https://googleplex-android-review.googlesource.com/c/device/google_car/+/12470124

Change-Id: I6fea5bb6da002319c296940a44a06c2756529de0