OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5a41b3f 3ed792d)
am 3ed792d5: Merge "Don\'t perform DNS lookup in android.net.Proxy.isLocalHost"
authorBrad Fitzpatrick <bradfitz@android.com>
Sun, 10 Oct 2010 18:49:43 +0000 (11:49 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Sun, 10 Oct 2010 18:49:43 +0000 (11:49 -0700)
Merge commit '3ed792d59cda9f9023201d80f5bdc62d4cef3090' into gingerbread-plus-aosp

* commit '3ed792d59cda9f9023201d80f5bdc62d4cef3090':
  Don't perform DNS lookup in android.net.Proxy.isLocalHost


Trivial merge
frameworks/base
About OSDN
Find Software
Develop Software
Help