commit d47b185a4edbe7d6c2939f9a3cb3799e3fc8d05c
author Amith Yamasani <yamasani@google.com> Fri Sep 05 17:19:26 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri Sep 05 17:19:26 2014 +0000
tree b0041b2105c90839af247549f105e475f4c706e5
parent c56f73a16877f293191b75cd867b6b9df79f800a
parent 6879fa333341844203c605a3f3c44d4c40fae826

am 4a73cfc4: am e7d2fe20: am 5c605494: Merge "Fix current.txt (fixes build)" into lmp-dev

* commit '4a73cfc46eca86105de27ed75dbc19dcd43b14a8':
  Fix current.txt (fixes build)

api/current.txt

diff --git a/api/current.txt b/api/current.txt
index 327c403..a1a0407 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -7888,7 +7888,7 @@
     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