| commit | 22570f51a5fb8ff7015eaf22dfaf4d224411bd24 | [log] [tgz] |
|---|---|---|
| author | Nick Kralevich <nnk@google.com> | Fri Jun 28 13:37:08 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jun 28 13:37:08 2013 -0700 |
| tree | fad71d90a122e2fd3ef45054369acbdeb380a58e | |
| parent | fda0c066050c26cbb5bb130b5f2c25ccddde2945 [diff] | |
| parent | a289964bca39c591b54e0c336da1a6730e85cd61 [diff] |
am a289964b: am 227b47a4: Merge "resolv_private.h: remove #define b64_ntop and b64_pton" * commit 'a289964bca39c591b54e0c336da1a6730e85cd61': resolv_private.h: remove #define b64_ntop and b64_pton