tree a51a9d1ec566c005b574ad5c83b56f9fd86cbe69
parent db9697b3b059469153e81bf9e8844fb8e23149ea
parent d40fd86ec5bdf56e8cd5a702ffc5332b6de931e4
author Kenny Root <kroot@android.com> 1359524976 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1359524976 -0800

am d40fd86e: Merge "Windows adb: initialize on to 1 in disable_tcp_nagle"

# By Ray Donnelly
# Via Gerrit Code Review (1) and Ray Donnelly (1)
* commit 'd40fd86ec5bdf56e8cd5a702ffc5332b6de931e4':
  Windows adb: initialize on to 1 in disable_tcp_nagle