summaryrefslogtreecommitdiff
path: root/test/MultiDexModifiedSecondary/Main.java
diff options
context:
space:
mode:
authorAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-03-13 13:35:27 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-03-13 13:35:27 +0000
commit1e15399d89793dd0703a18d375221feb50bfcabb (patch)
treec5b5f87563b1fd3aea0b1979b3d67bec44b545a9 /test/MultiDexModifiedSecondary/Main.java
parent17d814ec35437497565100780d4c29606c6acddd (diff)
parent765ef04253f5af14c7522abfc43737d10fed202a (diff)
[automerger skipped] Reland "art: Add FileDescriptor fields to native Core Platform API" am: 5edcca18fb am: 6ff6cb7625 am: b7f2e27ff8 am: 765ef04253 -s ours
am skip reason: Change-Id I9facfe3d3fa27cf50a345d24be1e7d7e0d26c848 with SHA-1 5edcca18fb is in history Change-Id: Ib519875f68a5e6b4ff8702f0f38638169df01275
Diffstat (limited to 'test/MultiDexModifiedSecondary/Main.java')
0 files changed, 0 insertions, 0 deletions