diff options
| author | Orion Hodson <oth@google.com> | 2020-07-15 09:34:13 +0100 |
|---|---|---|
| committer | Orion Hodson <oth@google.com> | 2020-07-15 10:51:08 +0000 |
| commit | 675c4145814b9563aff5c099e723629af26d747e (patch) | |
| tree | 757afce420ab548b4900c3fe288e9a67caacf58c /test/MultiDexModifiedSecondary/main.jpp | |
| parent | 733c214a5cb6fab6a4729863a3dc6136b46c0ef8 (diff) | |
Recover from bad merge conflict for GetDirectBuffer{Address,Capacity}
Merge conflict (I4f62fb0c229fc5edb9a7673d29b5ec9c5c32db66) between
aosp/master and goog/rvc-dev sided with goog/rvc-dev, but should
have sided with aosp/master. This change syncs the affected files
with aosp/master.
Bug: 122025675
Test: art/test/run-test --host 2036-jni-filechannel
Test: art_runtime_tests
Change-Id: Ie47a731c3803f4a65731dd8a3cd9c92ba1cf1cdd
Diffstat (limited to 'test/MultiDexModifiedSecondary/main.jpp')
0 files changed, 0 insertions, 0 deletions