commit | 4da4b9e4c5c55c6c9bb73ca80d59b1698f2aafd8 | [log] [tgz] |
---|---|---|
author | Josh Gao <jmgao@google.com> | Thu Aug 11 20:39:43 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Thu Aug 11 20:39:43 2016 +0000 |
tree | d027eb2e62ec84ba60f881ae2fd30db51405b898 | |
parent | 6fbd0a58cbb7d4e5017f243f7ce8e13dedffd659 [diff] | |
parent | 35ed616e58f1929896d26a7db368e0774abb9862 [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: de37556d65 am: 35ed616e58 -s ours Change-Id: I93246a9e87ac3c2480c9646d7fb0fad3d09b7c59