OSDN Git Service

am 2446b68f: Merge "Fix the DNS proxy again, for reals."
authorBrad Fitzpatrick <bradfitz@android.com>
Wed, 26 Jan 2011 00:21:25 +0000 (16:21 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 26 Jan 2011 00:21:25 +0000 (16:21 -0800)
* commit '2446b68f8c0d72972f8f6ec7fa972d05a29c9f02':
  Fix the DNS proxy again, for reals.


Trivial merge