Merge "adb: actually fix the windows build." into klp-dev

am: da66b9100a

Change-Id: If9b3829707e7fc6d9846bc769108180e08d67b5f
This commit is contained in:
Josh Gao 2016-11-17 21:43:27 +00:00 committed by android-build-merger
commit 0b4bd3feea

Diff Content Not Available