| commit | 0adada3a813212f9bb710e6a063cf32b82bd6e04 | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Thu Jul 30 15:33:01 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jul 30 15:33:01 2015 +0000 |
| tree | 1537ee5cbccb59e1fa93b786a6831a482f4fbd73 | |
| parent | 0a7afe5aa3dfe12169d634e4aeef0612ba427b24 [diff] | |
| parent | 9b69542897ca6081be010be61085d2b6c330dee9 [diff] |
am bb9c0a00: am 42dbc4b1: am 44443bea: Merge "Use _WIN32 rather than HAVE_WINSOCK." * commit 'bb9c0a00316bfb55fb4d690022143e347f06c0ee': Use _WIN32 rather than HAVE_WINSOCK.