diff options
| author | Yue, VincentX <vincentx.yue@intel.com> | 2017-12-18 13:11:25 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-12-18 13:11:25 +0000 |
| commit | 7e5b36c85cae319003cd23d40e427f6ceb759d4c (patch) | |
| tree | 376a5249c57e9e228c794b72c3f0b2fe46e47f3a /include/ScopedJavaUnicodeString.h | |
| parent | c7b5f3457547d1142dd9dc424f3401b296ff9fef (diff) | |
| parent | 959235067ec41a047782c2721363a35b924fb331 (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
Change-Id: I9afe7e90abdbe33bb568c720e07e8ab7fbd35f65
Diffstat (limited to 'include/ScopedJavaUnicodeString.h')
0 files changed, 0 insertions, 0 deletions