| commit | f7a7e3c301fdf7d98d8bcabf6fefb0fcf5bbf90d | [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 | cabb85f7d44f6dc1d0100a6f5d3af8cb82cd8db9 | |
| parent | cbe7544a3e848872def9cbf67110c78aa21d8ab1 [diff] | |
| parent | 6dfb039b0ba56576b4ed043e02ae43fb6afd42aa [diff] |
am 6dfb039b: am 4a343436: Merge "Fix win32 undefined reference to `_socket_network_client_timeout\'." * commit '6dfb039b0ba56576b4ed043e02ae43fb6afd42aa': Fix win32 undefined reference to `_socket_network_client_timeout'.