commit 431d4415e0d5270b1b84dc07773881a51f07f4a7
author Fedor Kudasov <kudasov@google.com> Tue Jul 09 07:46:55 2019 -0700
committer android-build-merger <android-build-merger@google.com> Tue Jul 09 07:46:55 2019 -0700
tree 6d77ef52db0921f15199f74c6c5c5d86ce66944f
parent 0850a3034cbfb490d428b55aae6ba06c34b4a637
parent 6619c84f7ff5a846324ca54f4f40cd074e4ba8d8

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

Change-Id: I2b5f7da15051c57b2050b78100b69e87ebbaf989

core/java/android/net/NetworkUtils.java

diff --git a/core/java/android/net/NetworkUtils.java b/core/java/android/net/NetworkUtils.java
index e6472e9..d0f54b4 100644
--- a/core/java/android/net/NetworkUtils.java
+++ b/core/java/android/net/NetworkUtils.java
@@ -16,10 +16,15 @@
 
 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.net.shared.Inet4AddressUtils;
 import android.os.Build;
 import android.system.ErrnoException;
+import android.system.Os;
 import android.util.Log;
 import android.util.Pair;