| commit | a3dec0763d10f9838cc715ecc5a081a024d7abb4 | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Thu Aug 27 14:30:46 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 14:30:46 2015 +0000 |
| tree | 5672430a9f41c6eb948db44ee1706bd3fb354ba9 | |
| parent | 9b53eb2d3e46b33444531950fd25a6385a098be0 [diff] | |
| parent | 04e1f221b7ce6c64418c46d686d801e96cd539e1 [diff] |
am 000de11a: am c6dbc858: (-s ours) am 42dbc4b1: am 44443bea: Merge "Use _WIN32 rather than HAVE_WINSOCK." * commit '000de11a5669fc444897955ebe287914fbaba405':