| commit | 706ae7b0c2538f6ccbacd6ea11504278293ea02e | [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 | 7f8bebb160db812be94c7915568205f3dc927e69 [diff] | |
| parent | d68c6e2d71fe7bb382d4750fbd6738685dab1a8a [diff] |
am 44443bea: Merge "Use _WIN32 rather than HAVE_WINSOCK." * commit '44443bead6cf3c6e71029e7181f64ba82c6a8c8e': Use _WIN32 rather than HAVE_WINSOCK.