| commit | 0787d3c93bd52d8799bc1fbc4848e56d669337f7 | [log] [tgz] |
|---|---|---|
| author | Brad Fitzpatrick <bradfitz@android.com> | Tue Jan 25 16:21:25 2011 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jan 25 16:21:25 2011 -0800 |
| tree | 3b58bdc878852c2765241c5b844f9e40a794d39b | |
| parent | 8cee7841d6aec9868dc94961e42277e332376f12 [diff] | |
| parent | 2446b68f8c0d72972f8f6ec7fa972d05a29c9f02 [diff] |
am 2446b68f: Merge "Fix the DNS proxy again, for reals." * commit '2446b68f8c0d72972f8f6ec7fa972d05a29c9f02': Fix the DNS proxy again, for reals.