tree 62c6482d298dcd2e6043998f298d3b2c5bba10f8
parent b42f141315ae0929325335645d397db04a500c88
parent 2dea56e05c45c1a16232152dec239c2506ab6d97
author Elliott Hughes <enh@google.com> 1400544009 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1400544009 +0000

am 2dea56e0: am 9e0a6248: Merge "Fix Windows socket_network_client.c build failures."

* commit '2dea56e05c45c1a16232152dec239c2506ab6d97':
  Fix Windows socket_network_client.c build failures.