| commit | b6bbcb1fca8919ed245ebaef208a7ece66966426 | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Tue May 20 19:21:36 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue May 20 19:21:36 2014 +0000 |
| tree | 244f8577feb0483b58674a5a6f6c2b2649f02335 | |
| parent | 202d315723a958ba9dc6add8642809c7ffb3f3b8 [diff] | |
| parent | 564b04627df0f8092580f30e1187eedb173ee321 [diff] |
am 564b0462: Merge "Fix win32 undefined reference to `_socket_network_client_timeout\'." * commit '564b04627df0f8092580f30e1187eedb173ee321': Fix win32 undefined reference to `_socket_network_client_timeout'.