tree 02d5219d39c17ae51a15911b75d17315fc90be3f
parent e528f048689868a2d4dfdf23b553fe536acd15cd
parent f8a6a2f602ad4ec049b2d2d4741571a76c3d014b
author Elliott Hughes <enh@google.com> 1438270371 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1438270371 +0000

am f8a6a2f6: Merge "Use _WIN32 rather than HAVE_WINSOCK."

* commit 'f8a6a2f602ad4ec049b2d2d4741571a76c3d014b':
  Use _WIN32 rather than HAVE_WINSOCK.