summaryrefslogtreecommitdiffstats
path: root/api/current.txt
diff options
context:
space:
mode:
authorBjorn Bringert <bringert@android.com>2013-03-13 13:28:00 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2013-03-13 13:28:01 +0000
commit133e2db8732df5135675e1a06cab63e66ffdc875 (patch)
tree257187b0a145564924f1bc1fc3994e16d8747bdb /api/current.txt
parent86277467eec5e269328364e91abe164991653635 (diff)
parent964e7d2549bc321236565dfb4c3f2c492e5a68b4 (diff)
downloadframeworks_base-133e2db8732df5135675e1a06cab63e66ffdc875.zip
frameworks_base-133e2db8732df5135675e1a06cab63e66ffdc875.tar.gz
frameworks_base-133e2db8732df5135675e1a06cab63e66ffdc875.tar.bz2
Merge "Hide VOICE_ASSIST intent DO NOT MERGE" into jb-mr2-dev
Diffstat (limited to 'api/current.txt')
-rw-r--r--api/current.txt1
1 files changed, 0 insertions, 1 deletions
diff --git a/api/current.txt b/api/current.txt
index 4eb6a0b..be104a0 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -5919,7 +5919,6 @@ package android.content {
field public static final java.lang.String ACTION_USER_INITIALIZE = "android.intent.action.USER_INITIALIZE";
field public static final java.lang.String ACTION_USER_PRESENT = "android.intent.action.USER_PRESENT";
field public static final java.lang.String ACTION_VIEW = "android.intent.action.VIEW";
- field public static final java.lang.String ACTION_VOICE_ASSIST = "android.intent.action.VOICE_ASSIST";
field public static final java.lang.String ACTION_VOICE_COMMAND = "android.intent.action.VOICE_COMMAND";
field public static final deprecated java.lang.String ACTION_WALLPAPER_CHANGED = "android.intent.action.WALLPAPER_CHANGED";
field public static final java.lang.String ACTION_WEB_SEARCH = "android.intent.action.WEB_SEARCH";