commit 8fa26975d4d890974f450410b44b7bfafa2e4452
author bohu <bohu@google.com> Wed Oct 24 19:43:12 2018 -0700
committer android-build-merger <android-build-merger@google.com> Wed Oct 24 19:43:12 2018 -0700
tree ba188eccdfe8c40edb2eeef25527e3d25d49eb8b
parent 8862513c52b172dd2b29cbb9444cbbe1a7c6fb52
parent 29c5d67a1f32e0d1f2532b6be22d9eb65d634eed

Merge "adb: correct tcpip help message" am: 19fb58ce57
am: aeb774304b

Change-Id: Ib4d41e0c095e9ec2167a1fe929eb9f5ae66aab10

adb/client/commandline.cpp

diff --git a/adb/client/commandline.cpp b/adb/client/commandline.cpp
index 3124852..b5bed28 100644
--- a/adb/client/commandline.cpp
+++ b/adb/client/commandline.cpp
@@ -204,8 +204,8 @@
         " sideload OTAPACKAGE      sideload the given full OTA package\n"
         " root                     restart adbd with root permissions\n"
         " unroot                   restart adbd without root permissions\n"
-        " usb                      restart adb server listening on USB\n"
-        " tcpip PORT               restart adb server listening on TCP on PORT\n"
+        " usb                      restart adbd listening on USB\n"
+        " tcpip PORT               restart adbd listening on TCP on PORT\n"
         "\n"
         "internal debugging:\n"
         " start-server             ensure that there is a server running\n"