commit | 7b46106345b980d405f3467310870fcd370a17bf | [log] [tgz] |
---|---|---|
author | Josh Gao <jmgao@google.com> | Thu Aug 11 21:15:24 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Thu Aug 11 21:15:24 2016 +0000 |
tree | d027eb2e62ec84ba60f881ae2fd30db51405b898 | |
parent | e1074f32efde1d53a62156012ea6041ee5e42786 [diff] | |
parent | a8ce875cfbd7d195370103ca2962c3084c6d900d [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 am: a8ce875cfb -s ours Change-Id: I309fb21b09f18f13d89db66ed01558b0b9df429e