diff options
| author | Bryce Lee <brycelee@google.com> | 2015-01-28 17:52:59 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-01-28 17:52:59 +0000 |
| commit | 2a8ccd4b1f82086f6e38ec32ad084306400dcf93 (patch) | |
| tree | 6830ac7aca0947cc9163cff2de7d163eb7be0dce /core/java | |
| parent | 4b41400b60d57f23b16702540b9d50f98aeeffb7 (diff) | |
| parent | 1061652a37e18683c994f9d4b872ecf990125a05 (diff) | |
| download | frameworks_base-2a8ccd4b1f82086f6e38ec32ad084306400dcf93.zip frameworks_base-2a8ccd4b1f82086f6e38ec32ad084306400dcf93.tar.gz frameworks_base-2a8ccd4b1f82086f6e38ec32ad084306400dcf93.tar.bz2 | |
am 1061652a: Merge "Revert "Make THEATER_MODE_ON setting a system api."" into lmp-mr1-dev
* commit '1061652a37e18683c994f9d4b872ecf990125a05':
Revert "Make THEATER_MODE_ON setting a system api."
Diffstat (limited to 'core/java')
| -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 92349338..838686a 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -5101,7 +5101,6 @@ public final class Settings { * Whether Theater Mode is on. * {@hide} */ - @SystemApi public static final String THEATER_MODE_ON = "theater_mode_on"; /** |