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

* commit '56d11898aa6937df3d1342b7d99dca8813d162a4':
This commit is contained in:
Elliott Hughes 2015-08-27 11:52:56 +00:00 committed by Android Git Automerger
commit 840a4fe0c7

Diff content is not available