am 5ca8b9b0: am dc5993b3: am 4931ae54: Merge "Minor "adb help" fixes." (9bbf6f0d) · Commits · e / os / android_system_core

adb/commandline.cpp

+3 −3

Original line number	Diff line number	Diff line
		@@ -110,7 +110,6 @@ static void help() {
		" ('-a' means copy timestamp and mode)\n"
		" adb sync [ <directory> ] - copy host->device only if changed\n"
		" (-l means list but don't copy)\n"
		" (see 'adb help all')\n"
		" adb shell - run remote shell interactively\n"
		" adb shell <command> - run remote shell command\n"
		" adb emu <command> - run emulator console command\n"
		@@ -210,11 +209,12 @@ static void help() {
		" adb reboot sideload - reboots the device into the sideload mode in recovery program (adb root required).\n"
		" adb reboot sideload-auto-reboot\n"
		" - reboots into the sideload mode, then reboots automatically after the sideload regardless of the result.\n"
		" adb reboot-bootloader - reboots the device into the bootloader\n"
		" adb sideload <file> - sideloads the given package\n"
		" adb root - restarts the adbd daemon with root permissions\n"
		" adb unroot - restarts the adbd daemon without root permissions\n"
		" adb usb - restarts the adbd daemon listening on USB\n"
		" adb tcpip <port> - restarts the adbd daemon listening on TCP on the specified port\n"
		"\n"
		"networking:\n"
		" adb ppp <tty> [parameters] - Run PPP over USB.\n"
		" Note: you should not automatically start a PPP connection.\n"
		@@ -229,7 +229,7 @@ static void help() {
		" - If it is \"system\", \"vendor\", \"oem\" or \"data\", only the corresponding partition\n"
		" is updated.\n"
		"\n"
		"environmental variables:\n"
		"environment variables:\n"
		" ADB_TRACE - Print debug information. A comma separated list of the following values\n"
		" 1 or all, adb, sockets, packets, rwx, usb, sync, sysdeps, transport, jdwp\n"
		" ANDROID_SERIAL - The serial number to connect to. -s takes priority over this if given.\n"