tree 3e552c3f3f687e32f90fb0cd9285b5375e1195bd
parent 76dd8e33689292e6255b090da7408fba76919424
parent d033739d176f8a2da99f80ef4a03bdca0649b644
author Kenny Root <kroot@android.com> 1359525127 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1359525127 -0800

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

# By Ray Donnelly
# Via Android Git Automerger (1) and others
* commit 'd033739d176f8a2da99f80ef4a03bdca0649b644':
  Windows adb: initialize on to 1 in disable_tcp_nagle