3ed792d5
Merge commit '3ed792d59cda9f9023201d80f5bdc62d4cef3090' into gingerbread-plus-aosp * commit '3ed792d59cda9f9023201d80f5bdc62d4cef3090': Don't perform DNS lookup in android.net.Proxy.isLocalHost
405d4db5
134b28a7
0727a865
0a69f597
b998f311