| commit | b65208d1a98c4cc6b4fbae302f7718f056e2fadd | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Tue May 20 20:18:01 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue May 20 20:18:01 2014 +0000 |
| tree | b363fd58c3012759d4b2a59d803b3b0273470ed0 | |
| parent | aceba829f127349b331601fcc65293f5e81f7a65 [diff] | |
| parent | f7a7e3c301fdf7d98d8bcabf6fefb0fcf5bbf90d [diff] |
am f7a7e3c3: am 6dfb039b: am 4a343436: Merge "Fix win32 undefined reference to `_socket_network_client_timeout\'." * commit 'f7a7e3c301fdf7d98d8bcabf6fefb0fcf5bbf90d': Fix win32 undefined reference to `_socket_network_client_timeout'.