| commit | 93ce1db91ccd6d39db05a301d167da9f7236b0af | [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 | e976579909ded0d9c42d4a78407ad07f1cf6c990 [diff] | |
| parent | d71497a04c0eb5cd2bbe6b225a9e673ff62eff88 [diff] |
am 450b592d: am 42b8df38: Merge "adb: win32: specify socket protocol" * commit '450b592da5e630fad028e3a112651b7071971fd7': adb: win32: specify socket protocol