diff options
| author | Dianne Hackborn <hackbod@google.com> | 2009-11-18 11:51:05 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-11-18 11:51:05 -0800 |
| commit | a2f4c2543a7f78b77491c701230e8f406dcca540 (patch) | |
| tree | c44a3f3dad9cb5c0a9ab7cbaae2d2245edc09a75 /core/java/android/content | |
| parent | a4fa107f97933a81c42ee3cd9ca3984c08e5ab25 (diff) | |
| parent | 1d62ea9d8c2646d198b6967e2c6ae3dad5c18f9e (diff) | |
| download | frameworks_base-a2f4c2543a7f78b77491c701230e8f406dcca540.zip frameworks_base-a2f4c2543a7f78b77491c701230e8f406dcca540.tar.gz frameworks_base-a2f4c2543a7f78b77491c701230e8f406dcca540.tar.bz2 | |
am 1d62ea9d: Fix issue #2249821: Unable to start passion in safe mode
Merge commit '1d62ea9d8c2646d198b6967e2c6ae3dad5c18f9e' into eclair-mr2
* commit '1d62ea9d8c2646d198b6967e2c6ae3dad5c18f9e':
Fix issue #2249821: Unable to start passion in safe mode
Diffstat (limited to 'core/java/android/content')
| -rw-r--r-- | core/java/android/content/Intent.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/java/android/content/Intent.java b/core/java/android/content/Intent.java index 0085f26..6ba79b4 100644 --- a/core/java/android/content/Intent.java +++ b/core/java/android/content/Intent.java @@ -2105,10 +2105,10 @@ public class Intent implements Parcelable { "android.intent.extra.remote_intent_token"; /** - * @Deprecated See {@link #EXTRA_CHANGED_COMPONENT_NAME_LIST}; this field + * @deprecated See {@link #EXTRA_CHANGED_COMPONENT_NAME_LIST}; this field * will contain only the first name in the list. */ - public static final String EXTRA_CHANGED_COMPONENT_NAME = + @Deprecated public static final String EXTRA_CHANGED_COMPONENT_NAME = "android.intent.extra.changed_component_name"; /** |