diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-09 18:04:23 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-09 18:04:23 +0000 |
| commit | 3183956ec832a444f1a5bbf5455b5a1f28b51ba4 (patch) | |
| tree | 5cbe8f02c6ec0d937deb23b96047b59c735f2eb0 /test/MultiDexModifiedSecondary/Second.java | |
| parent | e3013e93696a9b3970d360d1d3fad2e467b13b90 (diff) | |
| parent | 378e8a1dd8009f49409ee9e71b0ecfb854bf54da (diff) | |
Merge "[automerger skipped] Preserve JNI bindings across structural redefinition am: 42131731f8 -s ours am: fa4b638882 -s ours" into rvc-d1-dev-plus-aosp am: 378e8a1dd8 -s ours
am skip reason: Change-Id Ie8a33234bb852a46e5275502c842553637c8a2c6 with SHA-1 42131731f8 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/art/+/11799332
Change-Id: I558fd15c84d28a520b5d49dcfba9790f7f49cd7f
Diffstat (limited to 'test/MultiDexModifiedSecondary/Second.java')
0 files changed, 0 insertions, 0 deletions