| commit | 9b69542897ca6081be010be61085d2b6c330dee9 | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Thu Jul 30 15:17:38 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jul 30 15:17:38 2015 +0000 |
| tree | 8c4e83802dff0d249d38b06df4cd1367a0fdb1da | |
| parent | 3f0813e52430bb7d13321c118a51d07369fe9107 [diff] | |
| parent | 706ae7b0c2538f6ccbacd6ea11504278293ea02e [diff] |
am 42dbc4b1: am 44443bea: Merge "Use _WIN32 rather than HAVE_WINSOCK." * commit '42dbc4b1859fe4de16b19e9b74324b345c5fcb9d': Use _WIN32 rather than HAVE_WINSOCK.