commit | 4de0622a15fd4ea6bd3e98f511db269f3f036fc4 | [log] [tgz] |
---|---|---|
author | Josh Gao <jmgao@google.com> | Thu Aug 11 20:57:44 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Thu Aug 11 20:57:44 2016 +0000 |
tree | ee853f496331ab6bc5f810a8e0be4c81ca587426 | |
parent | 4c72350411fd77512fc6b344dbb7a689f392498a [diff] | |
parent | c70e50e163fddaee55289ae833fc2f58acaf9430 [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 am: d7cdf29c99 Change-Id: I9be0e4c7089b900b401613fe0c489654ca6bed00