tree 568af6a018d44bbd26c81a0a737d47ac090cdd92
parent 8e9407506f5e805175488993e699be0703275feb
parent 4c6c6d1c7ed7d8481d717f949c18657efa5533af
author Elliott Hughes <enh@google.com> 1420840946 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1420840946 +0000

am 4c6c6d1c: Merge "You either have winsock or <sys/sockets.h>."

* commit '4c6c6d1c7ed7d8481d717f949c18657efa5533af':
  You either have winsock or <sys/sockets.h>.