Commit 6c9fc6d2 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge changes from topic 'socket.pre-close' 

* changes:
  Fix libcore.java.net.SocketTest#testFileDescriptorStaysSame
  Fix SocketTaggingTest#testSocket
  PlainSocketImpl: Create marker_fd lazily
  Revert commit eeb3b74d
parents 84fd6ebc fb564ce1
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment