Submit merged

Squashed commit of the following:

commit aeefab810c6331e2f96e81f20e4408b39dd3a2ca
Author: Vladimir Chtchetkine <vchtchetkine@google.com>
Date:   Thu Dec 2 07:40:34 2010 -0800

    Implement -attach-core UI option

    Change-Id: I4168e2d707cab1b4873ee16d86d5126c1a316abf

Change-Id: I2da1ef5d53641f3c60d83d8d5ddf3aff34b0c6c7
diff --git a/android/help.c b/android/help.c
index f49e3fa..93ae8b1 100644
--- a/android/help.c
+++ b/android/help.c
@@ -1040,6 +1040,21 @@
     "  a remote machine.\n"
     );
 }
+
+static void
+help_attach_core(stralloc_t*  out)
+{
+    PRINTF(
+    "  the -attach-core <console socket> options attaches the UI to a running emulator core process.\n\n"
+
+    "  the <console socket> parameter must be in the form [host:]port, where 'host' addresses the\n"
+    "  machine on which the core process is running, and 'port' addresses the console port number for\n"
+    "  the running core process. Note that 'host' value must be in the form that can be resolved\n"
+    "  into an IP address.\n\n"
+
+    "  Use -list-cores to enumerate console ports for all currently running core processes.\n"
+    );
+}
 #endif  // CONFIG_STANDALONE_UI
 
 static void