| commit | d48aefd49894677b23a11fd0240fd85fd12d108f | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Thu Aug 13 17:15:02 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 13 17:15:02 2015 +0000 |
| tree | 8d8664bccf25c21d18100ca29ceecd99d4d058a6 | |
| parent | 8fcba3e260dd8f06f8398eeff1e1d9a4de3aab05 [diff] | |
| parent | b875456c24fb005d888717e712457959a72e0523 [diff] |
am 1685b099: am 8836031b: Merge "adb: win32: fix shutdown deadlock" * commit '1685b09921ae2057acbd9655778660a2e81ec6b3': adb: win32: fix shutdown deadlock