diff options
| author | Jeff Sharkey <jsharkey@android.com> | 2012-04-11 19:24:25 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-04-11 19:24:25 -0700 |
| commit | f6e429531620688fa00bfae0cda4ec04d9c7d4ec (patch) | |
| tree | ff5677c6943d760de5fb647184be89070bef318f /core/java/android | |
| parent | e960c30d22deaf28df0d8c16cf36381ed06183c7 (diff) | |
| parent | 88d9710483c07c6fe985018e276532a2c480df81 (diff) | |
| download | frameworks_base-f6e429531620688fa00bfae0cda4ec04d9c7d4ec.zip frameworks_base-f6e429531620688fa00bfae0cda4ec04d9c7d4ec.tar.gz frameworks_base-f6e429531620688fa00bfae0cda4ec04d9c7d4ec.tar.bz2 | |
am 88d97104: am d9818244: Merge "DO NOT MERGE: Make component names visible in javadoc." into ics-mr1
* commit '88d9710483c07c6fe985018e276532a2c480df81':
DO NOT MERGE: Make component names visible in javadoc.
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/app/Activity.java | 2 | ||||
| -rw-r--r-- | core/java/android/app/Service.java | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/core/java/android/app/Activity.java b/core/java/android/app/Activity.java index 8e8d37d..f15fbf1 100644 --- a/core/java/android/app/Activity.java +++ b/core/java/android/app/Activity.java @@ -4277,7 +4277,7 @@ public class Activity extends ContextThemeWrapper /** * 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 <activity_component_name>". * * @param prefix Desired prefix to prepend at each line of output. * @param fd The raw file descriptor that the dump is being sent to. diff --git a/core/java/android/app/Service.java b/core/java/android/app/Service.java index 35bd8c0..e8d10cb 100644 --- a/core/java/android/app/Service.java +++ b/core/java/android/app/Service.java @@ -654,8 +654,8 @@ public abstract class Service extends ContextWrapper implements ComponentCallbac /** * 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 <yourservicename>". + * This is distinct from "dumpsys <servicename>", which only works for * named system services and which invokes the {@link IBinder#dump} method * on the {@link IBinder} interface registered with ServiceManager. * |