Merge "Changed output of get-main-user." into udc-dev
diff --git a/services/core/java/com/android/server/pm/UserManagerServiceShellCommand.java b/services/core/java/com/android/server/pm/UserManagerServiceShellCommand.java
index 333c98c..835ab6a 100644
--- a/services/core/java/com/android/server/pm/UserManagerServiceShellCommand.java
+++ b/services/core/java/com/android/server/pm/UserManagerServiceShellCommand.java
@@ -530,10 +530,10 @@
         PrintWriter pw = getOutPrintWriter();
         final int mainUserId = mService.getMainUserId();
         if (mainUserId == UserHandle.USER_NULL) {
-            pw.println("Couldn't get main user.");
+            pw.println("None");
             return 1;
         }
-        pw.println("Main user id: " + mainUserId);
+        pw.println(mainUserId);
         return 0;
     }