tree cabb85f7d44f6dc1d0100a6f5d3af8cb82cd8db9
parent cbe7544a3e848872def9cbf67110c78aa21d8ab1
parent 6dfb039b0ba56576b4ed043e02ae43fb6afd42aa
author Elliott Hughes <enh@google.com> 1400613871 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1400613871 +0000

am 6dfb039b: am 4a343436: Merge "Fix win32 undefined reference to `_socket_network_client_timeout\'."

* commit '6dfb039b0ba56576b4ed043e02ae43fb6afd42aa':
  Fix win32 undefined reference to `_socket_network_client_timeout'.