Merge "-e is really about TCP/IP devices, not emulators." am: f28f7c8a74 am: 5bdade8a93

am: cf24be99bb

Change-Id: I7d3bd8f949d4b7607747916b541b8c2b80807598
This commit is contained in:
Elliott Hughes 2017-01-14 03:00:24 +00:00 committed by android-build-merger
commit 13b71453fa

View file

@ -91,9 +91,9 @@ static void help() {
"global options:\n"
" -a listen on all network interfaces, not just localhost\n"
" -d use USB device (error if multiple devices connected)\n"
" -e use emulator (error if multiple emulators running)\n"
" -e use TCP/IP device (error if multiple TCP/IP devices available)\n"
" -s SERIAL\n"
" use device/emulator with given serial number (overrides $ANDROID_SERIAL)\n"
" use device with given serial number (overrides $ANDROID_SERIAL)\n"
" -p PRODUCT\n"
" name or path ('angler'/'out/target/product/angler');\n"
" default $ANDROID_PRODUCT_OUT\n"