tree 05853e4afe70f492c3333126038b45bdd74bed30
parent 19c244c51194c9314c8d7802adbf736eaeca0be8
parent d17cf08eca500a96f4808744b8a0a34664291de8
author Elliott Hughes <enh@google.com> 1442448523 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1442448523 +0000

am d17cf08e: Merge "adb: win32: fix regression on older versions of Windows"

* commit 'd17cf08eca500a96f4808744b8a0a34664291de8':
  adb: win32: fix regression on older versions of Windows