tree 90c1d497c75b561888f3e3b7b5cd05d50288586c
parent c5cacda57272a1dfb9cbd14390fdbd893391673a
parent 9871488223b5bd8f08f4a22920057297f942f94a
author Elliott Hughes <enh@google.com> 1438974692 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1438974692 +0000

am 98714882: Merge "adb start-server: Use a separate fd for sending initial OK"

* commit '9871488223b5bd8f08f4a22920057297f942f94a':
  adb start-server: Use a separate fd for sending initial OK