tree 8c4e83802dff0d249d38b06df4cd1367a0fdb1da
parent 70ab38a5702129ae1cc064345c76f66b4bfa57c2
parent 42dbc4b1859fe4de16b19e9b74324b345c5fcb9d
author Elliott Hughes <enh@google.com> 1438269458 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1438269458 +0000

am 42dbc4b1: am 44443bea: Merge "Use _WIN32 rather than HAVE_WINSOCK."

* commit '42dbc4b1859fe4de16b19e9b74324b345c5fcb9d':
  Use _WIN32 rather than HAVE_WINSOCK.