diff options
| author | Brian Carlstrom <bdc@google.com> | 2011-05-27 00:07:42 -0700 |
|---|---|---|
| committer | Brian Carlstrom <bdc@google.com> | 2011-05-27 01:21:50 -0700 |
| commit | a7284f0e72745d66155e1e282fc07113332790fa (patch) | |
| tree | b8660bbed40aef90e417b2ef60d8af24661e532c /core/java/android/webkit/DataLoader.java | |
| parent | aa4fa2c5b704b60f025c34fec42db63ede9ebf35 (diff) | |
Tracking merge of dalvik-dev to master
Adapt to change in the way MockWebServer sets up CONNECT proxies.
git cherry-pick --no-commit c7e2feee5e7908a019a0de91123c1feb9bdc38bc
React to move of Base64 in libcore
git cherry-pick --no-commit 119f7ebdd1f8df3a8ff8e3b8056bff725d569253
Expose and document android.net.HttpResponseCache.
git cherry-pick --no-commit 7b73f0fdb8c032a65c55610541d66385bd8bcbe6)
make update-api
Change-Id: Ieb48b304ea38ee8c2ec01e860d99b1404583889e
Diffstat (limited to 'core/java/android/webkit/DataLoader.java')
| -rw-r--r-- | core/java/android/webkit/DataLoader.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/webkit/DataLoader.java b/core/java/android/webkit/DataLoader.java index 235dc5be6289..e8d906934954 100644 --- a/core/java/android/webkit/DataLoader.java +++ b/core/java/android/webkit/DataLoader.java @@ -22,7 +22,7 @@ import com.android.internal.R; import java.io.ByteArrayInputStream; -import org.apache.harmony.luni.util.Base64; +import libcore.io.Base64; /** * This class is a concrete implementation of StreamLoader that uses the |