tree d8794ff977b2308122f9bd454cf7506552afeb76
parent 2aa94cfaf976bd761734c0d666d6bd5d15edc4e6
parent f100ad841f93e970b0aff0cdd27e8ff219197efe
author Josh Gao <jmgao@google.com> 1487970879 +0000
committer android-build-merger <android-build-merger@google.com> 1487970879 +0000

Merge "Revert "adb: remove win32 dependency on libwinpthread-1.dll."" am: 87eb0fc3d0 am: 00613c52ca
am: f100ad841f

Change-Id: I94a784f37c729291d840bae93c0e3b2647eb92f4