diff options
| author | Amith Yamasani <yamasani@google.com> | 2013-05-09 17:01:12 -0700 |
|---|---|---|
| committer | Amith Yamasani <yamasani@google.com> | 2013-05-09 17:07:08 -0700 |
| commit | ecd5afe1ef4aa2a5d11ad4fa356fb6d5f461efb4 (patch) | |
| tree | 66a1d61588c842837f1bc4b8d81675f3aa33d90f /core/java/android/content/Intent.java | |
| parent | 2d4edcf2e1ef94ef83e02ec2ad075b3603282812 (diff) | |
| parent | 069d7e9b81e17d31238e4d60420c3e31bb5e3b2f (diff) | |
resolved conflicts for merge of 069d7e9b to master
Change-Id: Ia8fd5de3d4cc275fd358132bcb2c198d1e7b6877
Diffstat (limited to 'core/java/android/content/Intent.java')
| -rw-r--r-- | core/java/android/content/Intent.java | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/core/java/android/content/Intent.java b/core/java/android/content/Intent.java index 793736d3e711..b2dfd8a1e853 100644 --- a/core/java/android/content/Intent.java +++ b/core/java/android/content/Intent.java @@ -2566,8 +2566,7 @@ public class Intent implements Parcelable, Cloneable { /** * Broadcast sent to the system when a user's information changes. Carries an extra * {@link #EXTRA_USER_HANDLE} to indicate which user's information changed. - * This is only sent to registered receivers, not manifest receivers. It is sent to the user - * whose information has changed. + * This is only sent to registered receivers, not manifest receivers. It is sent to all users. * @hide */ public static final String ACTION_USER_INFO_CHANGED = |