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