tree e6ba5c5ecd57eee22975a6db95c126f31e3af51d
parent 1384a18ed20af31a7e3ce782435a01424acf699d
parent 1827548bb0d4c85c1d83d3ee32a0f6113dfdec74
author Xin Li <delphij@google.com> 1697759668 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1697759668 +0000

[automerger skipped] Merge 10952656 am: 7fdf2ee9b1 -s ours am: 1827548bb0 -s ours

am skip reason: Merged-In I4bfb0abf31816ade2b34528d9e946ef86fb6e028 with SHA-1 5acea1234d is already in history

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

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