diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-03-10 14:46:29 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-03-10 14:46:29 +0000 |
| commit | 9f984d183d86e37f6f852c87501aca15bdeab0de (patch) | |
| tree | 3dac1b56a56106ebb9474cdbf1bb94870107fef5 /test/MultiDexModifiedSecondary/Main.java | |
| parent | 383ecaf6bd4d3b80c1de1219c364801e313f2ce0 (diff) | |
| parent | 8ad77e65e2766501977ec8f12c5fb95d7b9fc1dc (diff) | |
[automerger skipped] Revert "art: Add FileDescriptor fields to native Core Platform API" am: 1ad56980d2 -s ours am: 1a49081527 -s ours am: 9889d9892c -s ours am: 8ad77e65e2 -s ours
am skip reason: Change-Id Ie9fa5a25d5352f214a16e10d5bbbe45da9f3c486 with SHA-1 2db169ce8b is in history
Change-Id: I149e48a8991abb9e001c137d780b5776077b257a
Diffstat (limited to 'test/MultiDexModifiedSecondary/Main.java')
0 files changed, 0 insertions, 0 deletions