commit | 202d315723a958ba9dc6add8642809c7ffb3f3b8 | [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 | 9709ea6df3d90b9068f0f45c3222f72676b74db5 | |
parent | f7c9b701c3b1da5acf26c767ad6bc1cb3014ccb1 [diff] | |
parent | 2a47fbf1c2a3d1a6b033d85ed15be9dc7e899406 [diff] |
am 2a47fbf1: Merge "Fix win32 implicit declaration of function socket_network_client_timeout." * commit '2a47fbf1c2a3d1a6b033d85ed15be9dc7e899406': Fix win32 implicit declaration of function socket_network_client_timeout.