| commit | 645fcc6f59c0b76f37bfe941647ade5a6655c0dc | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Thu Aug 27 14:28:43 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 14:28:43 2015 +0000 |
| tree | 5672430a9f41c6eb948db44ee1706bd3fb354ba9 | |
| parent | d031bd7924fbe9e776a035229a87283de31e75b9 [diff] | |
| parent | 7f65c9081584c59aa877f3ae820bb9a4067a6fca [diff] |
am c14a92c1: am 994e9ea7: (-s ours) am f077e45c: am 9dad4ec4: Merge "Clean up the locking in usb_linux.cpp." * commit 'c14a92c1fc6c6fd6920b16426d8fb340d02ed214':