summaryrefslogtreecommitdiff
path: root/test/MultiDexModifiedSecondary/Second.java
diff options
context:
space:
mode:
authorAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-03-06 15:26:06 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-03-06 15:26:06 +0000
commitfbe7779bfe5c0c8d229aa4bb459ff538d8995050 (patch)
treedd9affb752655b4dace8a7fbdd48568d0e328c73 /test/MultiDexModifiedSecondary/Second.java
parentf448033d61d13d46ce66f3c952e4c0b14d25f02f (diff)
parent2aed4093397b0c9cfea126ecc6fa6ec82b4d5202 (diff)
Merge "[automerger skipped] Use {llndk,vndksp}.libraries.txt from VNDK APEX am: 1a8df199ee -s ours am: cbf5510d97 -s ours am skip reason: Change-Id If96fe7c75538e7fa94542e9b4d1d68a16cfa5f62 with SHA-1 26f7d10239 is in history" into rvc-d1-dev-plus-aosp am: 2aed409339 -s ours
am skip reason: Change-Id If96fe7c75538e7fa94542e9b4d1d68a16cfa5f62 with SHA-1 1a8df199ee is in history Change-Id: I1005dcbb060c0579ef25bc6ea62d850122bdd711
Diffstat (limited to 'test/MultiDexModifiedSecondary/Second.java')
0 files changed, 0 insertions, 0 deletions