am 184585c4: (-s ours) am af60acef: am 98714882: Merge "adb start-server: Use a separate fd for sending initial OK"

* commit '184585c417a4411b18ba41d938501ab3f5b25267':
This commit is contained in:
Elliott Hughes 2015-08-27 11:51:32 +00:00 committed by Android Git Automerger
commit 4f145188af

Diff content is not available