| commit | c6dbc85845e58464541bb0644ebd570c44841a4c | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Thu Jul 30 15:17:07 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jul 30 15:17:07 2015 +0000 |
| tree | 12b577b1f5d2e24e431f2f2545ee4d0dd92a03c2 | |
| parent | 6b802c4b9565c83a863c88416e6b7e5c3d418aeb [diff] | |
| parent | 42dbc4b1859fe4de16b19e9b74324b345c5fcb9d [diff] |
am 42dbc4b1: am 44443bea: Merge "Use _WIN32 rather than HAVE_WINSOCK." * commit '42dbc4b1859fe4de16b19e9b74324b345c5fcb9d': Use _WIN32 rather than HAVE_WINSOCK.