diff options
| author | Android Build Merger (Role) <android-build-merger@google.com> | 2017-10-30 18:08:55 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2017-10-30 18:08:55 +0000 |
| commit | f63d128dd953e0fe1c03fa1e2db4404e349727a8 (patch) | |
| tree | 8de285736b91eec08e1e60a5044f77415f524e79 /core/java | |
| parent | d18e375ece52aa0bf451a2e443afbe3e00037a0e (diff) | |
| parent | ee3dfb0c24ee523b9054c3040d2d7de67cb37a04 (diff) | |
Merge "Merge "Track moving of OkHttp facade API to new package." am: 45183fc5a7 am: 1f7fcb7970" into oc-mr1-dev-plus-aosp
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/net/Network.java | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/core/java/android/net/Network.java b/core/java/android/net/Network.java index 3c868c399b1f..903b602b42f8 100644 --- a/core/java/android/net/Network.java +++ b/core/java/android/net/Network.java @@ -16,14 +16,14 @@ package android.net; -import android.os.Parcelable; import android.os.Parcel; +import android.os.Parcelable; import android.system.ErrnoException; import android.system.Os; import android.system.OsConstants; -import libcore.net.http.Dns; -import libcore.net.http.HttpURLConnectionFactory; +import com.android.okhttp.internalandroidapi.Dns; +import com.android.okhttp.internalandroidapi.HttpURLConnectionFactory; import java.io.FileDescriptor; import java.io.IOException; @@ -34,11 +34,12 @@ import java.net.MalformedURLException; import java.net.Socket; import java.net.SocketAddress; import java.net.SocketException; -import java.net.UnknownHostException; import java.net.URL; import java.net.URLConnection; +import java.net.UnknownHostException; import java.util.Arrays; import java.util.concurrent.TimeUnit; + import javax.net.SocketFactory; /** |