summaryrefslogtreecommitdiff
path: root/libs/rs/rsScript.cpp
diff options
context:
space:
mode:
author Brad Fitzpatrick <bradfitz@android.com> 2010-10-10 11:49:43 -0700
committer Android Git Automerger <android-git-automerger@android.com> 2010-10-10 11:49:43 -0700
commitb3ffd4adccc430f59a9348dd218d23545e4f6c65 (patch)
treeea4cb3c78069d2f50823ce53b7f37c904c1b1c74 /libs/rs/rsScript.cpp
parent5a41b3f8aa788f164af495bac6dc2666568f4cb6 (diff)
parent3ed792d59cda9f9023201d80f5bdc62d4cef3090 (diff)
am 3ed792d5: Merge "Don\'t perform DNS lookup in android.net.Proxy.isLocalHost"
Merge commit '3ed792d59cda9f9023201d80f5bdc62d4cef3090' into gingerbread-plus-aosp * commit '3ed792d59cda9f9023201d80f5bdc62d4cef3090': Don't perform DNS lookup in android.net.Proxy.isLocalHost
Diffstat (limited to 'libs/rs/rsScript.cpp')
0 files changed, 0 insertions, 0 deletions