tree e6ba5c5ecd57eee22975a6db95c126f31e3af51d
parent e2031eec24abf2b1b62d2a39e541f64f0668ac36
parent a8616a36236a11f175adcc2af7843850f1405947
author Xin Li <delphij@google.com> 1702335449 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1702335449 +0000

[automerger skipped] Merge Android 14 QPR1 am: 6c224ab5e5 -s ours am: 0d0179829e -s ours am: a8616a3623 -s ours

am skip reason: Merged-In Iab42e5e106e2e5df2f0eaed553c319e0e8a5c07c with SHA-1 7fdf2ee9b1 is already in history

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

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