summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Amith Yamasani <yamasani@google.com> 2014-09-05 16:28:18 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2014-09-05 16:28:19 +0000
commit450592d37c8cff57bec754f89f45a8a21297510d (patch)
treefb811677505cfe9b60027504b5dce98d05255049
parentacd9ec05104f92cf235490575a1d753585f23f2d (diff)
parent229a125fa255694fca8b62bd6d839029ffbd5525 (diff)
Merge "Fix current.txt (fixes build)" into lmp-dev
-rw-r--r--api/current.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/api/current.txt b/api/current.txt
index 2706111740e0..f90596ed288f 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -7883,7 +7883,7 @@ package android.content {
field public static final java.lang.String EXTRA_TEXT = "android.intent.extra.TEXT";
field public static final java.lang.String EXTRA_TITLE = "android.intent.extra.TITLE";
field public static final java.lang.String EXTRA_UID = "android.intent.extra.UID";
- field public static final java.lang.String EXTRA_USER = "android.intent.extra.user";
+ field public static final java.lang.String EXTRA_USER = "android.intent.extra.USER";
field public static final int FILL_IN_ACTION = 1; // 0x1
field public static final int FILL_IN_CATEGORIES = 4; // 0x4
field public static final int FILL_IN_CLIP_DATA = 128; // 0x80