am 994e9ea7: (-s ours) am f077e45c: am 9dad4ec4: Merge "Clean up the locking in usb_linux.cpp."

* commit '994e9ea787dbfa584f83b77a0c49277351c7113b':
This commit is contained in:
Elliott Hughes 2015-08-27 11:44:29 +00:00 committed by Android Git Automerger
commit c14a92c1fc

Diff content is not available