Commits
Elliott Hughes authored and Android Git Automerger committed 204b4157b3fM
am f8a6a2f6: Merge "Use _WIN32 rather than HAVE_WINSOCK." * commit 'f8a6a2f602ad4ec049b2d2d4741571a76c3d014b': Use _WIN32 rather than HAVE_WINSOCK.
Showing diff toe528f048689