Commit 0c0cfd5c authored by Android (Google) Code Review's avatar Android (Google) Code Review
Browse files

Merge change I96cd6f5b into eclair 

* changes:
  Make the socket test accept ::1 as a valid result for InetAddress.getByName(null) if the system is set to prefer IPv6 addresses.
parents f94c5d77 b70cc0ff
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