tree 8ba5d9984f8123c3ddd080922efc46e1de82503e
parent 4b7895cdf64fef5064072e98531beafcfd775237
parent b01fe104e7856cd3093fec86b789fba94fb9ef47
author Josh Gao <jmgao@google.com> 1497309370 +0000
committer android-build-merger <android-build-merger@google.com> 1497309370 +0000

Merge "adb: fix deadlock between transport_unref and usb_close." am: bb0d0245b3 am: 3d21fe7814
am: b01fe104e7

Change-Id: I94128840430281a54c74cdfb2b35744b4730942f