diff options
author | Josh Gao <jmgao@google.com> | 2017-09-28 17:51:44 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2017-09-28 17:51:44 +0000 |
commit | c03127ef5c6287fbf75f775d7e052872adae9470 (patch) | |
tree | 911450864c64da08bda264bb9c79a8bd16fd9959 /trusty/coverage/coverage_test.cpp | |
parent | 27e56723de8819898a09f4d16b743f76136f3497 (diff) | |
parent | 2b933918fcdbfb411502a9b12d77d6a1895855ce (diff) |
Merge changes I12d46493,I0ed00441,I55e5dc5a,If61296ff into oc-mr1-dev
* changes:
adb: add lock to remove_socket.
Revert "adb: fix deadlock between transport_unref and usb_close."
adb: allow selection of a specific transport.
adb: fix deadlock in kick_all_transports.
Diffstat (limited to 'trusty/coverage/coverage_test.cpp')
0 files changed, 0 insertions, 0 deletions