| commit | d835f68a18653a4b14619f81d186e708ff1fec5e | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Thu Aug 27 12:07:49 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 12:07:49 2015 +0000 |
| tree | 778395704d7757ffaee95bb3d85d67bdfae29df7 | |
| parent | c6fd09eaaca2332cafff1cfcccca29c2b9127ee8 [diff] | |
| parent | e5faca1d4ac0de0920d379dca656c0f809045640 [diff] |
am e5faca1d: (-s ours) am bdb15a2a: Merge "Use _WIN32 rather than HAVE_WINSOCK in librilutils." * commit 'e5faca1d4ac0de0920d379dca656c0f809045640':