Merge changes from topics 'adb_thread', 'adb_loopback'
* changes:
adb: statically link libbase into the tests.
adb: kill adb_thread_{create, join, detach, exit}.
adb: don't try to resolve 'localhost'
diff --git a/commandline.cpp b/commandline.cpp
index 730dc72..7702b0e 100644
--- a/commandline.cpp
+++ b/commandline.cpp
@@ -169,15 +169,7 @@
" '-k': keep the data and cache directories\n"
"\n"
"backup/restore:\n"
- " backup [-f FILE] [-apk|-noapk] [-obb|-noobb] [-shared|-noshared] [-all] [-system|-nosystem] [PACKAGE...]\n"
- " write an archive of the device's data to FILE [default=backup.adb]\n"
- " package list optional if -all/-shared are supplied\n"
- " -apk/-noapk: do/don't back up .apk files (default -noapk)\n"
- " -obb/-noobb: do/don't back up .obb files (default -noobb)\n"
- " -shared|-noshared: do/don't back up shared storage (default -noshared)\n"
- " -all: back up all installed applications\n"
- " -system|-nosystem: include system apps in -all (default -system)\n"
- " restore FILE restore device contents from FILE\n"
+ " to show usage run \"adb shell bu help\"\n"
"\n"
"debugging:\n"
" bugreport [PATH]\n"