OSDN Git Service

am 1eef3e2f: (-s ours) am 1871a4f2: DNS Proxy should not hang on addresses containing...
authorBrian Carlstrom <bdc@google.com>
Mon, 2 May 2011 18:55:53 +0000 (11:55 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 2 May 2011 18:55:53 +0000 (11:55 -0700)
commitdfc668ef05df9bb150c25590a1afb17fc3101e60
tree3773c71e59e67cfce6f0b757cb2b02f7ef27a193
parent0475ae98cd8f45de815d67d1966edaf5997be9a9
parent1eef3e2f220e264984e1c9a94f3782a1350a3ff9
am 1eef3e2f: (-s ours) am 1871a4f2: DNS Proxy should not hang on addresses containing null bytes DO NOT MERGE

* commit '1eef3e2f220e264984e1c9a94f3782a1350a3ff9':
  DNS Proxy should not hang on addresses containing null bytes DO NOT MERGE