am 5e60d25d: (-s ours) am 1685b099: am 8836031b: Merge "adb: win32: fix shutdown deadlock"

* commit '5e60d25d66caf6b4a7dbbfb3c33c61eecb6a93bf':
This commit is contained in:
Elliott Hughes 2015-08-27 11:53:04 +00:00 committed by Android Git Automerger
commit 4ef7772843

Diff content is not available