tree 834f2ceb7501031f38e112507e12ebad8bd80be6
parent 8000125306419ddda460f2a17e5bf23d24d13f9e
parent f960f88a848b14fd31ebb7c7201872c3d24c83b3
author Xin Li <delphij@google.com> 1614814619 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1614814619 +0000

[automerger skipped] Merge RQ2A.210305.007 am: 37fe041479 -s ours am: f960f88a84 -s ours

am skip reason: Change-Id I141efeec319cdf0c74317a70cfec936472290d19 with SHA-1 bcdb7abac4 is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/car/services/+/1613642

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9cd5927c15c4dfe3817e482d23b1c07cd5bbb8d4