tree dc1ffee56aa6581a0498796e756af3518c3b3aad
parent 6f8666a363705c54847d59e3a88fcbe7de9e60b1
parent aee5f8f1a7dbffdf4d9aa93b345cc04a24372664
author Ray Essick <essick@google.com> 1600283710 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1600283710 +0000

Merge "MediaScannerTest: Stopped using resources in apk" am: 1fe284e9c1 am: aee5f8f1a7

Original change: https://android-review.googlesource.com/c/platform/cts/+/1423450

Change-Id: I9f34a71fd48bf8130e603b2a5de0e08e09a7b040