commit | d18375235c62480b70ec9f271c9ef93c2e2c6014 | [log] [tgz] |
---|---|---|
author | Brad Fitzpatrick <bradfitz@android.com> | Tue Jan 25 16:25:20 2011 -0800 |
committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jan 25 16:25:20 2011 -0800 |
tree | 3b58bdc878852c2765241c5b844f9e40a794d39b | |
parent | 2c028218ea56c5fcf6f5afe34b01861be4006d71 [diff] | |
parent | 8cee7841d6aec9868dc94961e42277e332376f12 [diff] |
am 8cee7841: am 41efab55: Merge "Fix DNS proxy." * commit '8cee7841d6aec9868dc94961e42277e332376f12': Fix DNS proxy.