tree 18eb4ba9cd480f090a1e9590949d4b7c25d2bb76
parent 118611fee87eaa8b196cb725070b9034adc9c5b7
parent 2a7b410db459f96a28ebbf09a6469e209e47789b
author Xin Li <delphij@google.com> 1709805291 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1709805291 +0000

[automerger skipped] Merge Android 14 QPR2 to AOSP main am: 2a7b410db4 -s ours

am skip reason: Merged-In Ifaeb166476d8934f7183a2e146c5a07d69bd644a with SHA-1 118611fee8 is already in history

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

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