am c6dbc858: (-s ours) am 42dbc4b1: am 44443bea: Merge "Use _WIN32 rather than HAVE_WINSOCK."

* commit 'c6dbc85845e58464541bb0644ebd570c44841a4c':
This commit is contained in:
Elliott Hughes 2015-08-27 11:49:26 +00:00 committed by Android Git Automerger
commit 000de11a56

Diff content is not available