tree be0fc640f7f5646d557e432a4e248c716211c2b6
parent 850d6d99e4d1477c9ee137973a35145505578863
parent cf476c93609076440db18c129e3899b0f1b63118
author Josh Gao <jmgao@google.com> 1490918507 +0000
committer android-build-merger <android-build-merger@google.com> 1490918507 +0000

Merge "Revert "adb: check our socketpair ends in our win32 emulation."" am: c1314c8b13 am: 83b3c0817f
am: cf476c9360

Change-Id: I9aaf0ec0c9ba7dab9825da5eb7629a54c4068aeb