OSDN Git Service

am 5f8099ed: Merge "Add java.util.List import."
authorNarayan Kamath <narayan@google.com>
Mon, 3 Nov 2014 16:00:57 +0000 (16:00 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 3 Nov 2014 16:00:57 +0000 (16:00 +0000)
* commit '5f8099ed181c2ba279c4a747096442389d5f8840':
  Add java.util.List import.

1  2 
core/java/android/net/Proxy.java

Simple merge