Merge changes from topic "am-c3479d1074da4f49a5c817b8ee7f386a" into stage-aosp-master am: a3d0c3f78a -s ours

am skip reason: Merged-In I43ad6f72d8592c973f1d72328baea175100c6201 with SHA-1 a4954c17a8 is already in history

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

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