diff options
| author | Amith Yamasani <yamasani@google.com> | 2013-04-19 12:49:40 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-04-19 12:49:40 -0700 |
| commit | 8dc25e068071759fc57629f3ea112083e6ac6f2c (patch) | |
| tree | 6ab923e119885fbfde458e741ae13178c4df71b7 /core/java/android/content/Intent.java | |
| parent | 3aefa11119597394387eb92e1aacf5d6b9195869 (diff) | |
| parent | ba56701493ede3f5f338a03173da0327a215b223 (diff) | |
am ba567014: am e37c8f78: Merge "Improve API and documentation" into jb-mr2-dev
* commit 'ba56701493ede3f5f338a03173da0327a215b223':
Improve API and documentation
Diffstat (limited to 'core/java/android/content/Intent.java')
| -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 ea0e02787917..5fa1a6cd52db 100644 --- a/core/java/android/content/Intent.java +++ b/core/java/android/content/Intent.java @@ -2424,8 +2424,8 @@ public class Intent implements Parcelable, Cloneable { * which is of type <code>ArrayList<RestrictionEntry></code>. It can also * contain an extra {@link #EXTRA_RESTRICTIONS_INTENT}, which is of type <code>Intent</code>. * The activity specified by that intent will be launched for a result which must contain - * the extra {@link #EXTRA_RESTRICTIONS_LIST}. The keys and values of the returned restrictions - * will be persisted. + * one of the extras {@link #EXTRA_RESTRICTIONS_LIST} or {@link #EXTRA_RESTRICTIONS_BUNDLE}. + * The keys and values of the returned restrictions will be persisted. * @see RestrictionEntry */ public static final String ACTION_GET_RESTRICTION_ENTRIES = |