commit | 0c12f5ef329d142a093332d2f5133e0230419218 | [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 | 1761da1a9c21e9c836156d025ed06e870b0c094a [diff] | |
parent | ada4c0cfbd8277f2158bcfdd76d77183472b3869 [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