tree 5c0d26459a6fb68017e605843032c7fc2e342bad
parent f6d28fcaf048dba2e422824f52ac687b48768c0b
parent 42b8df38439b390f9c67eee567717f30143cf64f
author Elliott Hughes <enh@google.com> 1443841748 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1443841748 +0000

am 42b8df38: Merge "adb: win32: specify socket protocol"

* commit '42b8df38439b390f9c67eee567717f30143cf64f':
  adb: win32: specify socket protocol