commit | 796b20157f75e46ad91b7d894796e0ba55a7766e | [log] [tgz] |
---|---|---|
author | Elliott Hughes <enh@google.com> | Tue May 20 15:55:43 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Tue May 20 15:55:43 2014 +0000 |
tree | df938309c9ade4a47c5d932d313b3bd98c0d4e1b | |
parent | 2dea56e05c45c1a16232152dec239c2506ab6d97 [diff] | |
parent | 51e27f955b79846e36097532a725f4b7a3eefef8 [diff] |
am 51e27f95: Merge "Fix win32 implicit declaration of function socket_network_client_timeout." * commit '51e27f955b79846e36097532a725f4b7a3eefef8': Fix win32 implicit declaration of function socket_network_client_timeout.