tree a8ee6588e1a425a761961e9f8220ff871c16b337
parent f094447ed7ce277efccd2eb13bf9433cbe3871f2
parent c394c237222697e0492cd296d6e0f67da6730e72
author Elliott Hughes <enh@google.com> 1498006972 +0000
committer android-build-merger <android-build-merger@google.com> 1498006972 +0000

Merge "Give a clear error message if we can't start the server." am: b6d3f28287
am: 1496863091

Change-Id: Ib069ba411e74e6d8c22799a37dc16642b728fb06