OSDN Git Service

am e5faca1d: (-s ours) am bdb15a2a: Merge "Use _WIN32 rather than HAVE_WINSOCK in...
authorElliott Hughes <enh@google.com>
Thu, 27 Aug 2015 12:07:49 +0000 (12:07 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 12:07:49 +0000 (12:07 +0000)
commitd835f68a18653a4b14619f81d186e708ff1fec5e
tree778395704d7757ffaee95bb3d85d67bdfae29df7
parentc6fd09eaaca2332cafff1cfcccca29c2b9127ee8
parente5faca1d4ac0de0920d379dca656c0f809045640
am e5faca1d: (-s ours) am bdb15a2a: Merge "Use _WIN32 rather than HAVE_WINSOCK in librilutils."

* commit 'e5faca1d4ac0de0920d379dca656c0f809045640':