| commit | ef401528a2f4f74a9fcbe2c18f698cb0ddd7fd9b | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Thu Aug 27 14:34:11 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 14:34:11 2015 +0000 |
| tree | 5672430a9f41c6eb948db44ee1706bd3fb354ba9 | |
| parent | 3c750334e264df895bf92e3791c7f10521aafde3 [diff] | |
| parent | 463f4d3b04c2e1655b33be1789d31d3830e4ce77 [diff] |
am 11b2ecae: am e6b72a4e: (-s ours) am 06a9f560: am 7989a7c8: Merge "adb: win32: fix USB device hang when resuming from sleep/hibernation" * commit '11b2ecae3fe624510657d1d536b5f13872985dd7':