| commit | 7f65c9081584c59aa877f3ae820bb9a4067a6fca | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Thu Aug 27 11:44:29 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 11:44:29 2015 +0000 |
| tree | 8c31250a527d15d67e52f8d8871ae6062178ee22 | |
| parent | 8965fb45d356385fae74a4d9a8e003cf009c8b5f [diff] | |
| parent | d778fd679f447252a66c5bf161043a1db1faba8e [diff] |
am 994e9ea7: (-s ours) am f077e45c: am 9dad4ec4: Merge "Clean up the locking in usb_linux.cpp." * commit '994e9ea787dbfa584f83b77a0c49277351c7113b':