diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-03-09 14:38:09 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-03-09 14:38:09 +0000 |
| commit | aaae67b30ddf6591b62268ede7d8e2370381bd44 (patch) | |
| tree | 941dd5daee34c5164889b21733303bab6987793c /test/MultiDexModifiedSecondary/Second.java | |
| parent | ebf13e9a9c2e539b61b20e320ec40455d45b6a60 (diff) | |
| parent | 8e968251660c35bdc6f28deb5abca2aa3c060564 (diff) | |
[automerger skipped] art: Add FileDescriptor fields to native Core Platform API am: 334e2f16ca am: 4cc157e882 -s ours am: 8e96825166 -s ours
am skip reason: Change-Id Ifd25daed95516b27eaae4b034fdc45f77ea25a74 with SHA-1 47d0c475a1 is in history
Change-Id: If5a7dca95f7ec70aa2a8f61c866d2b9d5d7d5659
Diffstat (limited to 'test/MultiDexModifiedSecondary/Second.java')
0 files changed, 0 insertions, 0 deletions