commit | d5f404d865c611fbc69f8d1f4755c35e8fee664e | [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 | bdb351e67c409d97815029939b0578cfc030b655 | |
parent | 4f45fbdd46a95d9c75246d1356696e59366f5cb7 [diff] | |
parent | 5199176d19e09ca22a3519144ab275ec9e24b99d [diff] |
am 5199176d: am b6bbcb1f: am 564b0462: Merge "Fix win32 undefined reference to `_socket_network_client_timeout\'." * commit '5199176d19e09ca22a3519144ab275ec9e24b99d': Fix win32 undefined reference to `_socket_network_client_timeout'.