Commit 63292f18 authored by Pete Bentley's avatar Pete Bentley Committed by android-build-merger
Browse files

Merge "Handle null file descriptors when finalizing SocketChannelImpl." am: a5a4434a 

am: 66a2980f

Change-Id: I49d09b22e08c5e36454ab22ccdf2341727ab822f
parents fb8ada77 66a2980f
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