| commit | bd4502a736a9b0b70347bdcf1a74e47005902926 | [log] [tgz] |
|---|---|---|
| author | Brad Fitzpatrick <bradfitz@android.com> | Tue Jan 25 16:22:27 2011 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jan 25 16:22:27 2011 -0800 |
| tree | 3a2b2837195ae194cd6bc07efc441207aee1cf66 | |
| parent | 3b3944e42f4fa3c78952147e59b21ca3b252b54d [diff] | |
| parent | 901f24b988029ae127362d72f11af67b545a24b6 [diff] |
am 901f24b9: resolved conflicts for merge of ff242869 to honeycomb-plus-aosp * commit '901f24b988029ae127362d72f11af67b545a24b6': DNS proxy: the start. proxies getaddrinfo calls.