tree ba5cdd013eac099f02c63583fc4b32a85b9349e3
parent 533f6bba1578c6d8a471f5a7a271ea41661b513f
parent 108dad714456d384cfffce9a11e8cc336e5faabe
author Josh Gao <jmgao@google.com> 1497309161 +0000
committer android-build-merger <android-build-merger@google.com> 1497309161 +0000

Merge "adb: fix deadlock between transport_unref and usb_close." am: 6f61a6d9c4
am: 2a8ce10cd8

Change-Id: I3cce2167e58402732be09a3eb567cf0de3536f09