tree 15de70ad9cd3f6a41ae8ec577b2d73064ecb9b85
parent 45e4064876fa9494b1968f4dc47d93473f1dfbd7
parent 477b4d8f5cbfe80ad8336a794fc538cd34574c78
author Elliott Hughes <enh@google.com> 1498007213 +0000
committer android-build-merger <android-build-merger@google.com> 1498007213 +0000

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

Change-Id: Ic2244ee02ca83ccdffcfbefac49797c2e4f7d459