| commit | e5faca1d4ac0de0920d379dca656c0f809045640 | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Thu Jul 30 15:17:05 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jul 30 15:17:05 2015 +0000 |
| tree | f3e3cf738c8b078a3cdcee851b0487871472fd23 | |
| parent | a015339ee4484ad46ae8c60138f6e478cc0e3002 [diff] | |
| parent | bdb15a2afe89fd2458224accf59ed9a8bda7d3e6 [diff] |
am bdb15a2a: Merge "Use _WIN32 rather than HAVE_WINSOCK in librilutils." * commit 'bdb15a2afe89fd2458224accf59ed9a8bda7d3e6': Use _WIN32 rather than HAVE_WINSOCK in librilutils.