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

[automerger skipped] Merge "Merge Android 14 QPR1" into main am: 76bb3087f8 -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: Ic659f1840af8a29f868ecbaa7ca221c696c9bf85
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>