diff options
| author | Narayan Kamath <narayan@google.com> | 2014-11-03 16:00:57 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-11-03 16:00:57 +0000 |
| commit | 10ac55ba4f0beed608b310c473bb052cbcdf19c1 (patch) | |
| tree | c121349d0096239315b052ed5fedff1f73ae18c4 /core/java/android | |
| parent | 2e1bd46a1567fa987df04dd8eef66e91b50ef4f3 (diff) | |
| parent | 5f8099ed181c2ba279c4a747096442389d5f8840 (diff) | |
am 5f8099ed: Merge "Add java.util.List import."
* commit '5f8099ed181c2ba279c4a747096442389d5f8840':
Add java.util.List import.
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/net/Proxy.java | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/core/java/android/net/Proxy.java b/core/java/android/net/Proxy.java index c391eb859c52..bc1e4d59dd3b 100644 --- a/core/java/android/net/Proxy.java +++ b/core/java/android/net/Proxy.java @@ -26,6 +26,7 @@ import android.util.Log; import java.net.InetSocketAddress; import java.net.ProxySelector; import java.net.URI; +import java.util.List; import java.util.regex.Matcher; import java.util.regex.Pattern; |