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)
commit2446b68f8c0d72972f8f6ec7fa972d05a29c9f02
tree3bd069a2e6126840181f20c01b3c8e592214d94b
parent41efab55c8ca0344d5d68d0a3ab5b1b43f905e3b
parentdf9a6a82700a14169cc9d0b74833f1e261b171c6
Merge "Fix the DNS proxy again, for reals."