tree d0cb5fd374b259db8b8193b03c0c25f4155df752
parent 6628acb570ca332953b3087bdb046c7df2ecad3a
parent e6912e4606cbb57a398b3f3a882f14d2d18ee0f8
author Josh Gao <jmgao@google.com> 1497906581 +0000
committer android-build-merger <android-build-merger@google.com> 1497906581 +0000

Merge "adb: fix deadlock between transport_unref and usb_close." into oc-dr1-dev
am: 38eb25e157  -s ours

Change-Id: I029ddf455138b68118aa5eeb4178031c81f0a35f