tree 8059ab20e2f5bf7b623fa575b33789712f1284b1
parent 8a7036f2ef9e4866c9613c8d7a36fb14e850c05d
parent 8a827d52961f590455ee2ae6403cbf37ddc61044
author Xin Li <delphij@google.com> 1673557761 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1673557761 +0000

[automerger skipped] Merge tm-qpr-dev-plus-aosp-without-vendor@9467136 am: 580d6ea3ad -s ours am: 8a827d5296 -s ours

am skip reason: Merged-In I0cdd30c1c199b9aee73fa4bcce9efbc4e0d7ff8d with SHA-1 6e4cdd28cf is already in history

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

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