| commit | 9bcc55123ec814074417994db99730929a31fec8 | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Tue May 20 16:00:25 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue May 20 16:00:25 2014 +0000 |
| tree | fadcf47760680f9d44218c1206beb1fa662a2a19 | |
| parent | 87d0f45b3c30dff02bd92f542e5e9e64816f5315 [diff] | |
| parent | 796b20157f75e46ad91b7d894796e0ba55a7766e [diff] |
am 796b2015: am 51e27f95: Merge "Fix win32 implicit declaration of function socket_network_client_timeout." * commit '796b20157f75e46ad91b7d894796e0ba55a7766e': Fix win32 implicit declaration of function socket_network_client_timeout.