commit 15e37df00d4480a51500f7cdc26181db08238c7f
author Xavier Ducrohet <xav@android.com> Tue Aug 25 23:59:57 2009 -0700
committer Android Git Automerger <android-git-automerger@android.com> Tue Aug 25 23:59:57 2009 -0700
tree 9d8440f4b996ceefcc2bc9d1577c1dbcdbd8e8cf
parent 5f64296995844981fdfebebdd4b5d84044df3c28
parent 1bba53f7c851068c127d16ba160cd3074d6027db

am 1bba53f7: Fix broken \'adb root\' command.

Merge commit '1bba53f7c851068c127d16ba160cd3074d6027db' into eclair-plus-aosp

* commit '1bba53f7c851068c127d16ba160cd3074d6027db':
  Fix broken 'adb root' command.

adb/commandline.c

diff --git a/adb/commandline.c b/adb/commandline.c
index 5d3187a..411bb82 100644
--- a/adb/commandline.c
+++ b/adb/commandline.c
@@ -929,7 +929,7 @@
 
     if(!strcmp(argv[0], "remount") || !strcmp(argv[0], "reboot")
             || !strcmp(argv[0], "tcpip") || !strcmp(argv[0], "usb")
-            || !strcmp(argv[0], "reboot")) {
+            || !strcmp(argv[0], "root")) {
         char command[100];
         if (argc > 1)
             snprintf(command, sizeof(command), "%s:%s", argv[0], argv[1]);