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