tree 5101805c6f31d746e24a1fc5b8ceb5ef38b9f26a
parent 6db31c466796503f6bf13cd1257637846257fbc5
parent b9b0519995d4beeee9c443f046315b18305d369f
author Elliott Hughes <enh@google.com> 1442448983 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1442448983 +0000

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

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