diff options
| author | Elliott Hughes <enh@google.com> | 2013-07-18 09:36:48 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-07-18 09:36:48 -0700 |
| commit | 03a152d7e72f05456a463f2709ce787119e86f03 (patch) | |
| tree | c07b36ddc2a06652a145f79e55f22e46aeebe8e8 /core/java | |
| parent | 42658ed5182a75b82dd2b970a1f97fc30407d1e3 (diff) | |
| parent | 15cb526ece1420b1ae2061e20fd0982d82b41aae (diff) | |
| download | frameworks_base-03a152d7e72f05456a463f2709ce787119e86f03.zip frameworks_base-03a152d7e72f05456a463f2709ce787119e86f03.tar.gz frameworks_base-03a152d7e72f05456a463f2709ce787119e86f03.tar.bz2 | |
am 15cb526e: Merge "Fix import after okhttp update."
* commit '15cb526ece1420b1ae2061e20fd0982d82b41aae':
Fix import after okhttp update.
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/net/http/HttpResponseCache.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/net/http/HttpResponseCache.java b/core/java/android/net/http/HttpResponseCache.java index bd50bcf..269dfb8 100644 --- a/core/java/android/net/http/HttpResponseCache.java +++ b/core/java/android/net/http/HttpResponseCache.java @@ -17,9 +17,9 @@ package android.net.http; import android.content.Context; +import com.android.okhttp.OkResponseCache; import com.android.okhttp.ResponseSource; import com.android.okhttp.internal.DiskLruCache; -import com.android.okhttp.internal.http.OkResponseCache; import java.io.Closeable; import java.io.File; import java.io.IOException; |