| commit | d7cdf29c99f94a788f19bcdad6e0816529aad39b | [log] [tgz] |
|---|---|---|
| author | Josh Gao <jmgao@google.com> | Thu Aug 11 20:45:25 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Aug 11 20:45:25 2016 +0000 |
| tree | 18c307652a291de45b072ebdc6dc8a1304964caf | |
| parent | fb1584b0117232d942675158cb986836f9430812 [diff] | |
| parent | c1167dd4c96a1638a5e5bb163d225abb99b15816 [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: c1167dd4c9 Change-Id: I85a14afc779577487b01fc3e1ae19eb284354aa5