| commit | 5199176d19e09ca22a3519144ab275ec9e24b99d | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Tue May 20 19:24:31 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue May 20 19:24:31 2014 +0000 |
| tree | 0bd5f782cf3ea02cb82597faccda1146fa91f04a | |
| parent | 9f6b7187ef673f0cac1e7dc313fd6b49f0a2556a [diff] | |
| parent | b6bbcb1fca8919ed245ebaef208a7ece66966426 [diff] |
am b6bbcb1f: am 564b0462: Merge "Fix win32 undefined reference to `_socket_network_client_timeout\'." * commit 'b6bbcb1fca8919ed245ebaef208a7ece66966426': Fix win32 undefined reference to `_socket_network_client_timeout'.