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

* commit 'c14a92c1fc6c6fd6920b16426d8fb340d02ed214':
This commit is contained in:
Elliott Hughes 2015-08-27 14:28:43 +00:00 committed by Android Git Automerger
commit d8b018104b

Diff content is not available