OSDN Git Service

am a289964b: am 227b47a4: Merge "resolv_private.h: remove #define b64_ntop and b64_pton"
authorNick Kralevich <nnk@google.com>
Fri, 28 Jun 2013 20:37:08 +0000 (13:37 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 28 Jun 2013 20:37:08 +0000 (13:37 -0700)
* commit 'a289964bca39c591b54e0c336da1a6730e85cd61':
  resolv_private.h: remove #define b64_ntop and b64_pton


Trivial merge