diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2016-10-26 12:29:52 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2016-10-26 12:29:54 +0000 |
| commit | 6c9fc6d29d7caee593a475e6b61cab1c2ca7fe43 (patch) | |
| tree | 353de2ba15b7b5de0fa678dc82fc5c6e72419111 /include/ScopedJavaUnicodeString.h | |
| parent | 84fd6ebcd7a80863526dad1ec21a43c0c786a0ff (diff) | |
| parent | fb564ce131ee00c6c3bdcae758595c9460012133 (diff) | |
Merge changes from topic 'socket.pre-close'
* changes:
Fix libcore.java.net.SocketTest#testFileDescriptorStaysSame
Fix SocketTaggingTest#testSocket
PlainSocketImpl: Create marker_fd lazily
Revert commit eeb3b74d18cc9066ec3068a06d95d314c464ea5f
Diffstat (limited to 'include/ScopedJavaUnicodeString.h')
0 files changed, 0 insertions, 0 deletions