diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-03-10 15:15:58 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-03-10 15:15:58 +0000 |
| commit | 96546c10db95bdba193a4b359ffbce8d27ed4d6a (patch) | |
| tree | 3dac1b56a56106ebb9474cdbf1bb94870107fef5 /test/MultiDexModifiedSecondary/Main.java | |
| parent | ba9aabf126593807483376bf1fa03df71be2dbd1 (diff) | |
| parent | a743e338d6c883ad1eff87bf074131bacc35a20b (diff) | |
[automerger skipped] Revert "art: Add FileDescriptor fields to native Core Platform API" am: 1ad56980d2 am: 082447117a am: 15b6c5ff9c am: fef7d705c4 -s ours am: a743e338d6 -s ours
am skip reason: Change-Id Ie9fa5a25d5352f214a16e10d5bbbe45da9f3c486 with SHA-1 2db169ce8b is in history
Change-Id: I5ce981e5c5a60582990dc7df8ef967da82a7c205
Diffstat (limited to 'test/MultiDexModifiedSecondary/Main.java')
0 files changed, 0 insertions, 0 deletions