| commit | 6dfb039b0ba56576b4ed043e02ae43fb6afd42aa | [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 | 33be7d873f263d6a775294b0641f6474aa233a49 | |
| parent | 7563a601e47db0a7c429fff1776f8a17a6157ce0 [diff] | |
| parent | 4a343436e01b07c21c043f8a903689f70000ca73 [diff] |
am 4a343436: Merge "Fix win32 undefined reference to `_socket_network_client_timeout\'." * commit '4a343436e01b07c21c043f8a903689f70000ca73': Fix win32 undefined reference to `_socket_network_client_timeout'.