diff options
| author | Daniel Sandler <dsandler@android.com> | 2013-05-30 19:33:06 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-05-30 19:33:07 +0000 |
| commit | 054255c6d282a4ab2a95e56859242a2512871296 (patch) | |
| tree | 77dd28013db1c1760c4e1e6dc56b6f56cffde569 /core | |
| parent | 03a9172407103a8788e526be41a7d2c018e426ca (diff) | |
| parent | f3c1c7ea0a22c09a1212c0377c41f328242eec53 (diff) | |
| download | frameworks_base-054255c6d282a4ab2a95e56859242a2512871296.zip frameworks_base-054255c6d282a4ab2a95e56859242a2512871296.tar.gz frameworks_base-054255c6d282a4ab2a95e56859242a2512871296.tar.bz2 | |
Merge "Unhide action to launch Daydream settings." into jb-mr2-dev
Diffstat (limited to 'core')
| -rw-r--r-- | core/java/android/provider/Settings.java | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index f742385..3c8187e 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -650,7 +650,6 @@ public final class Settings { * <p> * Output: Nothing. * @see android.service.dreams.DreamService - * @hide */ @SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION) public static final String ACTION_DREAM_SETTINGS = "android.settings.DREAM_SETTINGS"; |