tree 11a227cb69e696eaa0a0b8adae487f4555840df3
parent 528957be940d40d18d4039c39582fd2e6f75c477
parent ef11e700f7c87b0f7b10c892fb693698de8b78ab
author Xin Li <delphij@google.com> 1696582982 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1696582982 +0000

[automerger skipped] Merge "Merge Android 14" into main am: a525debcb0 -s ours am: ef11e700f7 -s ours

am skip reason: Merged-In I32a7e6a58537ad59bff8882f581dd01574fc737d with SHA-1 13d9e232be is already in history

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

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