OSDN Git Service

Merge "Fix the DNS proxy again, for reals."
authorBrad Fitzpatrick <bradfitz@android.com>
Tue, 25 Jan 2011 23:08:05 +0000 (15:08 -0800)
committerAndroid Code Review <code-review@android.com>
Tue, 25 Jan 2011 23:08:05 +0000 (15:08 -0800)

Trivial merge