tree ddb00a79d5002a9e6fdc0d912d6a47c0f1d87f23
parent 06a0b6a01050e4e66a2f0c1caa88d3fe4f689ae7
parent 85d2ac2e1208c8b93efed0b982b08177a49355b6
author Dan Shi <dshi@google.com> 1565039946 -0700
committer android-build-merger <android-build-merger@google.com> 1565039946 -0700

Merge "Fix dependency on APK used by test"
am: 85d2ac2e12

Change-Id: I1ae6bff68d4aa4890fee47b5943e4d3420c32ed2