hg: jdk/sandbox: unixdomainchannels: continue fixing merge problem

[michael.x.mcmahon at oracle.com]

Changeset: f42fa400aca0
Author:    michaelm
Date:      2020-03-04 17:18 +0100
URL:       https://hg.openjdk.java.net/jdk/sandbox/rev/f42fa400aca0

unixdomainchannels: continue fixing merge problem

! src/java.base/share/classes/sun/nio/ch/InetSocketChannelImpl.java
! src/java.base/share/classes/sun/nio/ch/Net.java
! src/java.base/unix/native/libnio/ch/Net.c
! test/jdk/java/nio/channels/ProtocolFamilies.java