OSDN Git Service

am bdb15a2a: Merge "Use _WIN32 rather than HAVE_WINSOCK in librilutils."
authorElliott Hughes <enh@google.com>
Thu, 30 Jul 2015 15:17:37 +0000 (15:17 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 30 Jul 2015 15:17:37 +0000 (15:17 +0000)
* commit 'bdb15a2afe89fd2458224accf59ed9a8bda7d3e6':
  Use _WIN32 rather than HAVE_WINSOCK in librilutils.


Trivial merge