Merge "DO NOT MERGE: Make component names visible in javadoc." into ics-mr1

Author: jsharkey

core/java/android/app/Activity.java

@@ -4277,7 +4277,7 @@ public View onCreateView(View parent, String name, Context context, AttributeSet
 
     /**
      * Print the Activity's state into the given stream.  This gets invoked if
-     * you run "adb shell dumpsys activity <activity_component_name>".
+     * you run "adb shell dumpsys activity &lt;activity_component_name&gt;".
      *
      * @param prefix Desired prefix to prepend at each line of output.
      * @param fd The raw file descriptor that the dump is being sent to.

core/java/android/app/Service.java

@@ -654,8 +654,8 @@ public final void stopForeground(boolean removeNotification) {
 
     /**
      * Print the Service's state into the given stream.  This gets invoked if
-     * you run "adb shell dumpsys activity service <yourservicename>".
-     * This is distinct from "dumpsys <servicename>", which only works for
+     * you run "adb shell dumpsys activity service &lt;yourservicename&gt;".
+     * This is distinct from "dumpsys &lt;servicename&gt;", which only works for
      * named system services and which invokes the {@link IBinder#dump} method
      * on the {@link IBinder} interface registered with ServiceManager.
      *