tree c9128ec2803a01da0091ca352385a9977f1aa13d
parent f49da77e4a9cea6f2f5d8772b02f63ee4ab4e338
parent 2146f78c09e08efe19215ae52c4fa715023ee15c
author Elliott Hughes <enh@google.com> 1400034571 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1400034571 +0000

am 2146f78c: am 3e684183: Merge "Use the NetBSD inet_ntop until the OpenBSD bug is fixed."

* commit '2146f78c09e08efe19215ae52c4fa715023ee15c':
  Use the NetBSD inet_ntop until the OpenBSD bug is fixed.