am 840a4fe0: am 56d11898: (-s ours) am 80e83972: am 9537ca80: Merge "adb: start-server and kill-server error output"

* commit '840a4fe0c79a0af53621e3c81af3b35c9163ddf2':
This commit is contained in:
Elliott Hughes 2015-08-27 14:35:16 +00:00 committed by Android Git Automerger
commit 0be394f8ca

Diff content is not available