| commit | 0e39a1be9802d2ab1f02048e37e3ea474d441484 | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Thu Aug 27 11:53:04 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 11:53:04 2015 +0000 |
| tree | 8c31250a527d15d67e52f8d8871ae6062178ee22 | |
| parent | 611e9449bd737ece4aa7ab71bbc18c813d6798f3 [diff] | |
| parent | d48aefd49894677b23a11fd0240fd85fd12d108f [diff] |
am 5e60d25d: (-s ours) am 1685b099: am 8836031b: Merge "adb: win32: fix shutdown deadlock" * commit '5e60d25d66caf6b4a7dbbfb3c33c61eecb6a93bf':