Merge "Return NonNull and other imports" into stage-aosp-master am: ee24c6da27

am: 6619c84f7f

Change-Id: I2b5f7da15051c57b2050b78100b69e87ebbaf989
This commit is contained in:
Fedor Kudasov
2019-07-09 07:46:55 -07:00
committed by android-build-merger

View File

@@ -16,10 +16,15 @@
package android.net; package android.net;
import static android.system.OsConstants.AF_INET;
import static android.system.OsConstants.AF_INET6;
import android.annotation.NonNull;
import android.annotation.UnsupportedAppUsage; import android.annotation.UnsupportedAppUsage;
import android.net.shared.Inet4AddressUtils; import android.net.shared.Inet4AddressUtils;
import android.os.Build; import android.os.Build;
import android.system.ErrnoException; import android.system.ErrnoException;
import android.system.Os;
import android.util.Log; import android.util.Log;
import android.util.Pair; import android.util.Pair;