am d05446b3: am 7a2e1a02: Merge "Don\'t proxy getaddrinfo when net.dns1.[MYPID] is set."

* commit 'd05446b34e416d89261a31452afee10eb12bb71d':
  Don't proxy getaddrinfo when net.dns1.[MYPID] is set.
This commit is contained in:
Brad Fitzpatrick
2011-01-25 16:14:11 -08:00
committed by Android Git Automerger

Diff Content Not Available