tree e6ba5c5ecd57eee22975a6db95c126f31e3af51d
parent 2118655ea2a02b26482f43e853f22cf8ae003cf6
parent 5acea1234d773eeb4b7b2e2a961cb3db4e8a60d0
author Xin Li <delphij@google.com> 1696637980 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1696637980 +0000

[automerger skipped] Merge Android 14 am: 7a2977189d -s ours am: 1f9986b61e -s ours am: e151510365 -s ours am: c52126a7a2 -s ours am: 5acea1234d -s ours

am skip reason: Merged-In I9f5d291728c314cab7b1039620a47289832acc7a with SHA-1 35c817ce8d is already in history

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

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