| Index: tools/android/forwarder2/host_forwarder_main.cc | 
| diff --git a/tools/android/forwarder2/host_forwarder_main.cc b/tools/android/forwarder2/host_forwarder_main.cc | 
| index 96136609f5351d424a703c7221de5c1c1a1e6ae6..33fc99610eefd2aa410e1ef3a5253d9344c2c87d 100644 | 
| --- a/tools/android/forwarder2/host_forwarder_main.cc | 
| +++ b/tools/android/forwarder2/host_forwarder_main.cc | 
| @@ -161,7 +161,7 @@ class HostControllersManager { | 
| if (adb_port < 0) { | 
| SendMessage( | 
| "ERROR: could not get adb port for device. You might need to add " | 
| -          "'adb' to your PATH or provide the device serial id.", | 
| +          "'adb' to your PATH or provide the device serial id.\n", | 
| client_socket.get()); | 
| return; | 
| } | 
| @@ -172,7 +172,7 @@ class HostControllersManager { | 
| const bool controller_did_exist = DeleteRefCountedValueInMap( | 
| controller_key, controllers_.get()); | 
| if (!controller_did_exist) { | 
| -        SendMessage("ERROR: could not unmap port.", client_socket.get()); | 
| +        SendMessage("ERROR: could not unmap port.\n", client_socket.get()); | 
| LogExistingControllers(client_socket); | 
| } else { | 
| SendMessage("OK", client_socket.get()); | 
| @@ -182,7 +182,7 @@ class HostControllersManager { | 
| return; | 
| } | 
| if (host_port < 0) { | 
| -      SendMessage("ERROR: missing host port", client_socket.get()); | 
| +      SendMessage("ERROR: missing host port\n", client_socket.get()); | 
| return; | 
| } | 
| const bool use_dynamic_port_allocation = device_port == 0; | 
| @@ -204,7 +204,7 @@ class HostControllersManager { | 
| weak_ptr_factory_.GetWeakPtr()))); | 
| if (!host_controller.get()) { | 
| has_failed_ = true; | 
| -      SendMessage("ERROR: Connection to device failed.", client_socket.get()); | 
| +      SendMessage("ERROR: Connection to device failed.\n", client_socket.get()); | 
| LogExistingControllers(client_socket); | 
| return; | 
| } | 
| @@ -222,9 +222,9 @@ class HostControllersManager { | 
| } | 
|  | 
| void LogExistingControllers(const std::unique_ptr<Socket>& client_socket) { | 
| -    SendMessage("ERROR: Existing controllers:", client_socket.get()); | 
| +    SendMessage("ERROR: Existing controllers:\n", client_socket.get()); | 
| for (const auto& controller : *controllers_) { | 
| -      SendMessage(base::StringPrintf("ERROR:   %s", controller.first.c_str()), | 
| +      SendMessage(base::StringPrintf("ERROR: %s\n", controller.first.c_str()), | 
| client_socket.get()); | 
| } | 
| } | 
| @@ -350,7 +350,7 @@ class ServerDelegate : public Daemon::ServerDelegate { | 
| CHECK(pickle_it.ReadString(&device_serial)); | 
| int device_port; | 
| if (!pickle_it.ReadInt(&device_port)) { | 
| -      client_socket->WriteString("ERROR: missing device port"); | 
| +      client_socket->WriteString("ERROR: missing device port\n"); | 
| return; | 
| } | 
| int host_port; | 
|  |