commit a80fc8399a4f7f4b1c3def01de3ca8d75e5f5c4f
author David 'Digit' Turner <digit@google.com> Fri Jan 23 19:56:05 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri Jan 23 19:56:05 2015 +0000
tree c9ba9a1ea1180dcd65a65b15d43d1226839b5df8
parent f0ff493d4b62b4f494b1bb44f1668af0a9d4f3bc
parent 320ead2ac37fbce69d84a39da28ce873b4a816d7

am 320ead2a: am 1bc38a4c: Merge "adb: Fix \'adb forward --no-rebind\'."

* commit '320ead2ac37fbce69d84a39da28ce873b4a816d7':
  adb: Fix 'adb forward --no-rebind'.

adb/commandline.c

diff --git a/adb/commandline.c b/adb/commandline.c
index f345787..44541b7 100644
--- a/adb/commandline.c
+++ b/adb/commandline.c
@@ -1578,7 +1578,7 @@
         {
           if (argc != 3)
             return usage();
-          const char* command = no_rebind ? "forward:norebind:" : "forward";
+          const char* command = no_rebind ? "forward:norebind" : "forward";
           snprintf(buf, sizeof buf, "%s:%s:%s;%s", host_prefix, command, argv[1], argv[2]);
         }