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-13 13:35:33 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-03-13 13:35:33 +0000
commit327576d6f9082cc694718ba88950beade48774ad (patch)
tree086d39fb23caa114d5b8fb1e2fbbf39f32cce3b2 /test/MultiDexModifiedSecondary/Second.java
parent663c3d75a31f86928fe9329bf936a872bbd0049d (diff)
parent17d814ec35437497565100780d4c29606c6acddd (diff)
[automerger skipped] Reland "art: Add FileDescriptor fields to native Core Platform API" am: 5edcca18fb am: 6ff6cb7625 -s ours am: 0acea7f504 -s ours am: 17d814ec35 -s ours
am skip reason: Change-Id I9facfe3d3fa27cf50a345d24be1e7d7e0d26c848 with SHA-1 5edcca18fb is in history Change-Id: I19e4ee478e1374e4f63add8570084b01e4406939
Diffstat (limited to 'test/MultiDexModifiedSecondary/Second.java')
0 files changed, 0 insertions, 0 deletions