diff options
author | Josh Gao <jmgao@google.com> | 2016-08-11 20:29:12 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2016-08-11 20:29:12 +0000 |
commit | cfb8b6aea62b68abd49d287f631b0107f2fcae2f (patch) | |
tree | 78c8add0ffe77731a01ba25477d924c05469c4d1 /trusty/coverage/coverage_test.cpp | |
parent | 8b2a975e12de5a52b4d7653b4bf7ac1d8be966e5 (diff) | |
parent | 8dad649c6dc9f493a6a6467e861f453f08bc5d3f (diff) |
Merge "DO NOT MERGE: adb: reenable (and fix) Windows build." into mnc-dev am: 73c59ad77c am: 015d662cb8 am: 00d389f392
am: 8dad649c6d -s ours
Change-Id: Ic0c3050f457e3ccdd7ec101b74e61aae7a49f1b1
Diffstat (limited to 'trusty/coverage/coverage_test.cpp')
0 files changed, 0 insertions, 0 deletions