| commit | d05446b34e416d89261a31452afee10eb12bb71d | [log] [tgz] |
|---|---|---|
| author | Brad Fitzpatrick <bradfitz@android.com> | Tue Jan 25 15:41:28 2011 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jan 25 15:41:28 2011 -0800 |
| tree | 036b35c29df78cff6a44508160c443fe63cc385c | |
| parent | ff24286911ec8760174296e2228722e19a4d2bd6 [diff] | |
| parent | 7a2e1a0245f5645661fdbc6887c2bc7c7f49e0ee [diff] |
am 7a2e1a02: Merge "Don\'t proxy getaddrinfo when net.dns1.[MYPID] is set." * commit '7a2e1a0245f5645661fdbc6887c2bc7c7f49e0ee': Don't proxy getaddrinfo when net.dns1.[MYPID] is set.