tree 81edf70425cc8083527bb530e8b92e20055c4dd8
parent 073f731836497685503aa9ee9cd89d0773241103
parent 5c4bf3d66f94d6f042db71a37f32a2d8580dcef0
author Josh Gao <jmgao@google.com> 1470946960 +0000
committer android-build-merger <android-build-merger@google.com> 1470946960 +0000

DO NOT MERGE: adb: reenable (and fix) Windows build. am: 804de7a29e
am: 5c4bf3d66f

Change-Id: I4977bc17d446cc2b8959058e3e13ccf17e10857b