tree ff1fe92131dd4899e97e80dd38cda5eed71c32d3
parent 8cd8353f885cd7eaa7bbf1a66538268d4fe23bda
parent 52f5948bab5764c14f9e7bad134d9752bdec9852
author Xin Li <delphij@google.com> 1633655975 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1633655975 +0000

[automerger skipped] Merge "Merge Android 12" am: 52f5948bab -s ours

am skip reason: Merged-In I3e40d130df3221e2b73e1f138bd78389ba2abe70 with SHA-1 28ced5f1d7 is already in history

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

Change-Id: I48e95bbf875dc03e3ff9a7930232072dcd0fa1fd