Commits
Elliott Hughes authored and Android Git Automerger committed 734ae3554d4M
am 1db1b582: am 204b4157: am f8a6a2f6: Merge "Use _WIN32 rather than HAVE_WINSOCK." * commit '1db1b5821f6819a602f2dda5950d12b6f6183c36': Use _WIN32 rather than HAVE_WINSOCK.
Showing diff to897863baeb8