summaryrefslogtreecommitdiffstats
path: root/core/java/android/content/Intent.java
diff options
context:
space:
mode:
authorAlan Viverette <alanv@google.com>2014-07-23 21:41:25 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-07-23 18:50:38 +0000
commitf84bc66b21212df5402982b1c1eca615e64f7e1e (patch)
treedbee42820f86cb2f96558d7c40a113237ef19a74 /core/java/android/content/Intent.java
parentec80cd8e7c2c13123f1370edfa935115eb9a9164 (diff)
parent5a399490c2185ebfd458b1a1d9394f3a68c5fde2 (diff)
downloadframeworks_base-f84bc66b21212df5402982b1c1eca615e64f7e1e.zip
frameworks_base-f84bc66b21212df5402982b1c1eca615e64f7e1e.tar.gz
frameworks_base-f84bc66b21212df5402982b1c1eca615e64f7e1e.tar.bz2
Merge "Use activity for brightness dialog" into lmp-dev
Diffstat (limited to 'core/java/android/content/Intent.java')
-rw-r--r--core/java/android/content/Intent.java3
1 files changed, 1 insertions, 2 deletions
diff --git a/core/java/android/content/Intent.java b/core/java/android/content/Intent.java
index 3f705ac..287ea35 100644
--- a/core/java/android/content/Intent.java
+++ b/core/java/android/content/Intent.java
@@ -2682,8 +2682,7 @@ public class Intent implements Parcelable, Cloneable {
"android.intent.action.QUICK_CLOCK";
/**
- * Broadcast Action: This is broadcast when a user action should request the
- * brightness setting dialog.
+ * Activity Action: Shows the brightness setting dialog.
* @hide
*/
public static final String ACTION_SHOW_BRIGHTNESS_DIALOG =