tree 11a227cb69e696eaa0a0b8adae487f4555840df3
parent 82d2cd2535014c8402f284f4f24f2470a35d5120
parent ca41259dae3f32a7775540b7eb7c51d4e1e7c0b4
author Xin Li <delphij@google.com> 1693269282 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1693269282 +0000

[automerger skipped] Merge Android U (ab/10368041) am: 9a247936b5 -s ours am: ca41259dae -s ours

am skip reason: Merged-In I1c72e5ede24439b1471974bc32a9796a5e42878a with SHA-1 1242f7d4ee is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Stk/+/24181979

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