Merge "DO NOT MERGE: adb: reenable (and fix) Windows build." into mnc-dev

am: 73c59ad77c

Change-Id: I04df96934b6ea82865f94fcff0daf1bbd9ba63d2
This commit is contained in:
Josh Gao 2016-08-11 20:19:09 +00:00 committed by android-build-merger
commit 015d662cb8

Diff Content Not Available