[automerger skipped] Merge tm-qpr-dev-plus-aosp-without-vendor@9467136 am: 580d6ea3ad -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: I4e537a4a1ee40da2c4734b34438e6196fa1ff868
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
tree: cb9594c8f33c93ad3c9dc8457a0a0d29be86f5a8
  1. res/
  2. src/
  3. Android.bp
  4. AndroidManifest.xml
  5. CleanSpec.mk
  6. OWNERS