| commit | c1167dd4c96a1638a5e5bb163d225abb99b15816 | [log] [tgz] |
|---|---|---|
| author | Josh Gao <jmgao@google.com> | Thu Aug 11 20:32:49 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Aug 11 20:32:49 2016 +0000 |
| tree | 18c307652a291de45b072ebdc6dc8a1304964caf | |
| parent | 557d55afd57c8884343285cc4c00911b58ae2657 [diff] | |
| parent | cfb8b6aea62b68abd49d287f631b0107f2fcae2f [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 Change-Id: I1d064970bcc827b16feb4ac03268964869b15ccc