diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-03-13 13:36:07 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-03-13 13:36:07 +0000 |
| commit | 9d51a7115e9d5b1ca7f04e948d1577e182f004f9 (patch) | |
| tree | 086d39fb23caa114d5b8fb1e2fbbf39f32cce3b2 /test/MultiDexModifiedSecondary/main.jpp | |
| parent | 327576d6f9082cc694718ba88950beade48774ad (diff) | |
| parent | 1e15399d89793dd0703a18d375221feb50bfcabb (diff) | |
[automerger skipped] Reland "art: Add FileDescriptor fields to native Core Platform API" am: 5edcca18fb am: 6ff6cb7625 am: b7f2e27ff8 am: 765ef04253 -s ours am: 1e15399d89 -s ours
am skip reason: Change-Id I9facfe3d3fa27cf50a345d24be1e7d7e0d26c848 with SHA-1 5edcca18fb is in history
Change-Id: Ia5fa61ded4308be942e5ffab9520c5ed7788e17f
Diffstat (limited to 'test/MultiDexModifiedSecondary/main.jpp')
0 files changed, 0 insertions, 0 deletions