diff options
| author | Android Merger <noreply-android-build-merger@google.com> | 2017-12-18 13:02:52 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-12-18 13:02:52 +0000 |
| commit | 2c010066e085992c99e379b7c559c97404101646 (patch) | |
| tree | 1720b1ef0dd664e7490887dfb6ae0b6db5103641 /include/ScopedJavaUnicodeString.h | |
| parent | 40c8320b5f77587902c634ac09e6607d0a7acad9 (diff) | |
| parent | 54f94a32b6074ce056f68303623f131dbec680a0 (diff) | |
Merge "Merge "Porting from http://r.android.com/453156 to fix DatagramSocketTest#test_getRemoteSocketAddress" into marshmallow-cts-dev am: c1db58bc94 -s ours" into nougat-cts-dev
am: 54f94a32b6 -s ours
Change-Id: I6913006ad1da9b943d7ef8a52bc453878dbd9da3
Diffstat (limited to 'include/ScopedJavaUnicodeString.h')
0 files changed, 0 insertions, 0 deletions