commit | 49a59bf31788077ce3a53ed8acb6dd665ea9a421 | [log] [tgz] |
---|---|---|
author | Elliott Hughes <enh@google.com> | Sat Oct 03 03:14:55 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Sat Oct 03 03:14:55 2015 +0000 |
tree | 924cfce1a26ef34d45d5d498180ca22ce05ca4a5 | |
parent | fb068b39e0c12adeba46d00c7682751bd9381b22 [diff] | |
parent | 450b592da5e630fad028e3a112651b7071971fd7 [diff] |
am 450b592d: am 42b8df38: Merge "adb: win32: specify socket protocol" * commit '450b592da5e630fad028e3a112651b7071971fd7': adb: win32: specify socket protocol