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