Merge commit '3ed792d59cda9f9023201d80f5bdc62d4cef3090' into gingerbread-plus-aosp * commit '3ed792d59cda9f9023201d80f5bdc62d4cef3090': 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