| commit | 42dbc4b1859fe4de16b19e9b74324b345c5fcb9d | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Thu Jul 30 15:03:27 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jul 30 15:03:27 2015 +0000 |
| tree | 3f122e2c6e39a8d4d7590ec1371d42a6194e216b | |
| parent | 102ead3ae187a007b8a90b61ea243197927b6ae2 [diff] | |
| parent | 44443bead6cf3c6e71029e7181f64ba82c6a8c8e [diff] |
am 44443bea: Merge "Use _WIN32 rather than HAVE_WINSOCK." * commit '44443bead6cf3c6e71029e7181f64ba82c6a8c8e': Use _WIN32 rather than HAVE_WINSOCK.