| commit | 4b8529c5ec5745d9fefaf3957874b2924a7e69d0 | [log] [tgz] |
|---|---|---|
| author | Josh Gao <jmgao@google.com> | Thu Sep 28 17:51:44 2017 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Thu Sep 28 17:51:44 2017 +0000 |
| tree | 911450864c64da08bda264bb9c79a8bd16fd9959 | |
| parent | 99ef87acbfe42d6a29b35a8072cb9aed1b2a7742 [diff] | |
| parent | 30b519c99f99c2f15a02232b07e2f2f63df39135 [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.