commit f363bda252efe4201c60c0b042fee9e98bf4d48e
author Alexandra Gherghina <alexgherghina@google.com> Fri Sep 05 15:16:01 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Sep 05 15:16:02 2014 +0000
tree 7acc8cc2c8009fa28934da53d20f3a015a5372c7
parent 8d4e83aca0ee9cebaa15481e5cd666dc10bc0c67
parent 3315f6b5a36e984b1c24d6be07c155bf5108b4df

Merge "Rename intent extra following API review" into lmp-dev

core/java/android/content/Intent.java

diff --git a/core/java/android/content/Intent.java b/core/java/android/content/Intent.java
index b825c94..51a58d1 100644
--- a/core/java/android/content/Intent.java
+++ b/core/java/android/content/Intent.java
@@ -3363,7 +3363,7 @@
      * profiles - {@link #ACTION_MANAGED_PROFILE_ADDED} and {@link #ACTION_MANAGED_PROFILE_REMOVED}.
      */
     public static final String EXTRA_USER =
-            "android.intent.extra.user";
+            "android.intent.extra.USER";
 
     /**
      * Extra used in the response from a BroadcastReceiver that handles