commit | 35ed616e58f1929896d26a7db368e0774abb9862 | [log] [tgz] |
---|---|---|
author | Josh Gao <jmgao@google.com> | Thu Aug 11 20:35:48 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Thu Aug 11 20:35:48 2016 +0000 |
tree | ee853f496331ab6bc5f810a8e0be4c81ca587426 | |
parent | ae3c427e6c64fa976934419ecd8e59a5870f977d [diff] | |
parent | de37556d65ae2899c8822058886ef3038eebe7b4 [diff] |
Merge "DO NOT MERGE: adb: reenable (and fix) Windows build." into mnc-dev am: 73c59ad77c am: 015d662cb8 am: 00d389f392 am: 8dad649c6d -s ours am: cfb8b6aea6 am: de37556d65 Change-Id: I0528eae78dc6129b6f62dbc5b3e5d460362f389c