| commit | c12170c601a145bff297ae66010227692888cc62 | [log] [tgz] |
|---|---|---|
| author | Brad Fitzpatrick <bradfitz@android.com> | Tue Jan 25 16:22:30 2011 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jan 25 16:22:30 2011 -0800 |
| tree | 3a2b2837195ae194cd6bc07efc441207aee1cf66 | |
| parent | bd4502a736a9b0b70347bdcf1a74e47005902926 [diff] | |
| parent | 90da07a88225161feedbf518a37a3c22ec12a879 [diff] |
am 90da07a8: am d05446b3: am 7a2e1a02: Merge "Don\'t proxy getaddrinfo when net.dns1.[MYPID] is set." * commit '90da07a88225161feedbf518a37a3c22ec12a879': Don't proxy getaddrinfo when net.dns1.[MYPID] is set.