tree 11a227cb69e696eaa0a0b8adae487f4555840df3
parent 75033afb7ab14467057d1915a3f0b920f809e78e
parent dbde620281ca6654e4cc71c1b6e01f8f48dee8e0
author Xin Li <delphij@google.com> 1702332133 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1702332133 +0000

[automerger skipped] Merge Android 14 QPR1 am: 75077ec6a4 -s ours am: dbde620281 -s ours

am skip reason: Merged-In I6c53f585e7b4a3a04f71309b1cee37d58d419a60 with SHA-1 602a7a7c8c is already in history

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

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