diff options
| author | Yue, VincentX <vincentx.yue@intel.com> | 2017-12-18 13:16:41 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-12-18 13:16:41 +0000 |
| commit | 7987794c59ad27d5a403f15a026e8c8a68b79d31 (patch) | |
| tree | 557f5784cc58da46412ca9348caa19f84cd78400 /include/ScopedJavaUnicodeString.h | |
| parent | 20b648a0791268275137ad18c03e1d4a988c7150 (diff) | |
| parent | 648b779e85a0f9eba9b360402bf84db5dae4853a (diff) | |
Merge "Porting from http://r.android.com/453156 to fix DatagramSocketTest#test_getRemoteSocketAddress" into marshmallow-cts-dev am: c1db58bc94 am: 236c07dfbd am: b9ea2fd3cc am: 7d90697304 am: 959235067e -s ours am: 7e5b36c85c -s ours
am: 648b779e85 -s ours
Change-Id: I8bbfc21404936b356d7127819138c8cbfc17c9c8
Diffstat (limited to 'include/ScopedJavaUnicodeString.h')
0 files changed, 0 insertions, 0 deletions