tree 41404459c1543025d32e586ad023d34e7de593d9
parent 490b3edd3b0b3b695fdf7b13d44ac0922d9abe99
parent b69b068a1e25a7e0444acf4572bc5ce5eb78906d
author Xin Li <delphij@google.com> 1599795196 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1599795196 +0000

[automerger skipped] Merge Android R am: 81bd579114 -s ours am: 9362aaa561 -s ours am: b69b068a1e -s ours

am skip reason: Change-Id I0d44970326f4c8391459d98140f817235816759c with SHA-1 e04541b3f2 is in history

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

Change-Id: I97cb137995768e018d53c99454d0d2cee7b7e27c