OSDN Git Service

(root) / android-x86 / system-netd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0475ae9 1eef3e2)
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)
* commit '1eef3e2f220e264984e1c9a94f3782a1350a3ff9':
  DNS Proxy should not hang on addresses containing null bytes DO NOT MERGE


Trivial merge
system/netd
About OSDN
Find Software
Develop Software
Help