diff options
author | Yue, VincentX <vincentx.yue@intel.com> | 2017-12-18 13:01:21 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2017-12-18 13:01:21 +0000 |
commit | 236c07dfbd7c477eb3fdd9a0aab139918945e623 (patch) | |
tree | bac77a43b3ef303034df5c71e6e6aaf1c84767d7 /include/ScopedJavaUnicodeString.h | |
parent | 46ec47b8af6e4f3a502e94387f370c4658acd712 (diff) | |
parent | c1db58bc943a2b3e2a1273f4c887cda16df0ce7e (diff) |
Merge "Porting from http://r.android.com/453156 to fix DatagramSocketTest#test_getRemoteSocketAddress" into marshmallow-cts-dev
am: c1db58bc94
Change-Id: I5e193e23e285c64e3aadf4ce6074fb40bba412e3
Diffstat (limited to 'include/ScopedJavaUnicodeString.h')
0 files changed, 0 insertions, 0 deletions