| commit | 04e1f221b7ce6c64418c46d686d801e96cd539e1 | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Thu Aug 27 11:49:26 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 11:49:26 2015 +0000 |
| tree | 8c31250a527d15d67e52f8d8871ae6062178ee22 | |
| parent | 027167e162690b73d53e841ff9f43f57e6afca3c [diff] | |
| parent | 7570611af5b2da9373a45a6f4723bfa879bda945 [diff] |
am c6dbc858: (-s ours) am 42dbc4b1: am 44443bea: Merge "Use _WIN32 rather than HAVE_WINSOCK." * commit 'c6dbc85845e58464541bb0644ebd570c44841a4c':