commit 320ead2ac37fbce69d84a39da28ce873b4a816d7
author David 'Digit' Turner <digit@google.com> Fri Jan 23 16:55:37 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri Jan 23 16:55:37 2015 +0000
tree 6324d7809524e66ca56bb569f33a39ecfdf65fd7
parent 1fdd4dc0bc44af0dbbd458b44a84db9e775ebe7d
parent 1bc38a4cdc74f477b99185125089f20411baf431

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

* commit '1bc38a4cdc74f477b99185125089f20411baf431':
  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]);
         }