tree 21acad954e1523f152a355d5f6a7650fb119341e
parent 4a397e9d622edefa9e45251a1d6fec66a5e46c19
parent 6ab97117b77f4e93f18a883a44af7e995cdb66e2
author Xin Li <delphij@google.com> 1678845817 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1678845817 +0000

[automerger skipped] Merge Android 13 QPR2 am: 238660bf6b -s ours am: 9b61f607c1 -s ours am: c5514da62e -s ours am: a2d8ecb886 -s ours am: 6ab97117b7 -s ours

am skip reason: Merged-In Ib6081cf45ecf2a6d4b68434666a2e4da9c1d90d4 with SHA-1 7cd7be3549 is already in history

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

Change-Id: Ia3fa96a36c9f18bd6c4a78dff18b381e7df52923
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>