tree 095f7e01c00e4549a63c0693319d3229db727fc2
parent 4417c38a1eb64fb7cfffa75a5f705a79484ed3d5
parent e73a8a2388f019b0f7a6e468af27056edbb02521
author Elliott Hughes <enh@google.com> 1440793429 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1440793429 +0000

am e73a8a23: Merge "win32: adb start-server shows stdout/stderr output from actual server"

* commit 'e73a8a2388f019b0f7a6e468af27056edbb02521':
  win32: adb start-server shows stdout/stderr output from actual server