tree 3f122e2c6e39a8d4d7590ec1371d42a6194e216b
parent c5ba3abc6c8009d15ec9670b3a14d7c92774441b
parent 4e4af614014159c703f5f028a7712586269446ef
author Elliott Hughes <enh@google.com> 1438267796 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1438267796 +0000

Merge "Use _WIN32 rather than HAVE_WINSOCK."