tree 11a227cb69e696eaa0a0b8adae487f4555840df3
parent 1242f7d4eebfc90e1e6d1f60a68a90f45e3cded0
parent 9a247936b5a1b9375506b1bda9d91add5e410533
author Xin Li <delphij@google.com> 1693267123 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1693267123 +0000

[automerger skipped] Merge Android U (ab/10368041) am: 9a247936b5 -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: I1b28f59aef4a1f38d41338bdfd189bcf5815e1f4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>