Commits
Elliott Hughes authored and Android Git Automerger committed 1db1b5821f6M
am 204b4157: am f8a6a2f6: Merge "Use _WIN32 rather than HAVE_WINSOCK." * commit '204b4157b3fdbeea8859c4ad0e29be18d74e6f5f': Use _WIN32 rather than HAVE_WINSOCK.
Showing diff to204b4157b3f