tree d2cd12f7494c94a60a96136d6c49f8f8801fab82
parent 709815cffec6f2a756c30501e20646598769a115
parent 6dca19875325a2ed25f9b55d736a9f6d17afeaad
author Elliott Hughes <enh@google.com> 1438444089 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1438444089 +0000

am 6dca1987: am cf4dba5a: Merge "adb: win32: initial IPv6 support and improved Winsock error reporting"

* commit '6dca19875325a2ed25f9b55d736a9f6d17afeaad':
  adb: win32: initial IPv6 support and improved Winsock error reporting