[automerger skipped] Merge 10952656 am: 602a7a7c8c -s ours am: 75033afb7a -s ours

am skip reason: Merged-In Ibc2ad5e4610da4617d3a9bac07bb985eb0785fdb with SHA-1 9065b5b82c is already in history

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

Change-Id: I102b8a922eb94d28f9d708de8c3bf614b46c0e0c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
tree: 18eb4ba9cd480f090a1e9590949d4b7c25d2bb76
  1. res/
  2. src/
  3. Android.bp
  4. AndroidManifest.xml
  5. CleanSpec.mk
  6. OWNERS