tree 4f20b5e8e58c3c08989e32d02060f54b2084a062
parent 3aad8e98cc1a8ff513ecbb808b3b9e1180afa3ff
parent a1d075081f40dadbd98f303a68920de6c5ef0b6d
author Xin Li <delphij@google.com> 1598992638 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1598992638 +0000

[automerger skipped] Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709) am: a1d075081f -s ours

am skip reason: Change-Id I6de4610b93704406b4ea7ad1c10a5c094e2b9a74 with SHA-1 3aad8e98cc is in history

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

Change-Id: Ie95059083c12967533c838c03a7b528bed41bd50