commit | ada4c0cfbd8277f2158bcfdd76d77183472b3869 | [log] [tgz] |
---|---|---|
author | Josh Gao <jmgao@google.com> | Thu Aug 11 20:29:12 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Thu Aug 11 20:29:12 2016 +0000 |
tree | 78c8add0ffe77731a01ba25477d924c05469c4d1 | |
parent | a7eaed4360925a85918bc53d93641764ca41f0ff [diff] | |
parent | 1cac6ee4e9910a562387c966c81a87c06ea20a92 [diff] |
Merge "DO NOT MERGE: adb: reenable (and fix) Windows build." into mnc-dev am: 73c59ad77c am: 015d662cb8 am: 00d389f392 am: 8dad649c6d -s ours Change-Id: Ic0c3050f457e3ccdd7ec101b74e61aae7a49f1b1