summaryrefslogtreecommitdiff
path: root/test/ProfileTestMultiDex/Main.java
diff options
context:
space:
mode:
authorAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-02-23 00:24:10 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-02-23 00:24:10 +0000
commitebeed333a67cf5887619d7accd1c764ee67c1549 (patch)
treec86fbc2b1fc327c4898212d40ea46395efd53b84 /test/ProfileTestMultiDex/Main.java
parentcc2e2197537b9e6d995e2443a3397f1a95285177 (diff)
parent3c4d69bd5da08bdc72022f40223e3660d10641f0 (diff)
Merge "[automerger skipped] Do not accept vdex with dex sections from .dm files am: eb21b02108 -s ours" into rvc-qpr-dev-plus-aosp am: 3c4d69bd5d -s ours
am skip reason: Change-Id I5b104329af899ea62dc1779800264bad6b5424a4 with SHA-1 046cecfed5 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/art/+/13465327 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I4c77b0bfa4115d53ab5a9166d01382b3bcbcc75f
Diffstat (limited to 'test/ProfileTestMultiDex/Main.java')
0 files changed, 0 insertions, 0 deletions