diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-03-09 19:58:18 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-03-09 19:58:18 +0000 |
| commit | 3bc9b323f32fc211afe994bfcec0cca50dc51fff (patch) | |
| tree | de25e0b4d2875eb8d4331f8335dcaeccc55cd2aa /test/MultiDexModifiedSecondary/Main.java | |
| parent | 670e9b129f35bb688e7a0d80d668a8f707b3bdac (diff) | |
| parent | b1e09e5020ecea4233d57b9bc6906e36ec1e2cdb (diff) | |
[automerger skipped] art: Add FileDescriptor fields to native Core Platform API am: 334e2f16ca -s ours am: e2444b5ed0 -s ours am: da015d6a86 -s ours am: b1e09e5020 -s ours
am skip reason: Change-Id Ifd25daed95516b27eaae4b034fdc45f77ea25a74 with SHA-1 334e2f16ca is in history
Change-Id: I17c620f0175e294e2f765de433856a85668ebd90
Diffstat (limited to 'test/MultiDexModifiedSecondary/Main.java')
0 files changed, 0 insertions, 0 deletions