| commit | 5aa4e92ce82539961fc918cdfb93d5e5ac73c493 | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Thu Aug 27 14:35:20 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 14:35:20 2015 +0000 |
| tree | 5672430a9f41c6eb948db44ee1706bd3fb354ba9 | |
| parent | 8736e507bc4194c6067ac7976364d803ce6d74bf [diff] | |
| parent | 0e39a1be9802d2ab1f02048e37e3ea474d441484 [diff] |
am 4ef77728: am 5e60d25d: (-s ours) am 1685b099: am 8836031b: Merge "adb: win32: fix shutdown deadlock" * commit '4ef777284333ad87e5b4d99b81d65a75ebd821a9':