diff options
| author | Bryce Lee <brycelee@google.com> | 2015-01-28 17:58:41 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-01-28 17:58:41 +0000 |
| commit | 263987f6268439af69fcfa66a278103e1efe1343 (patch) | |
| tree | 80b5c7d7549344831a58adb6389b8fcbcc9da2b0 /core/java | |
| parent | 7fb346ec209eac91b9673840e10b3c9040dbef3f (diff) | |
| parent | 2a8ccd4b1f82086f6e38ec32ad084306400dcf93 (diff) | |
| download | frameworks_base-263987f6268439af69fcfa66a278103e1efe1343.zip frameworks_base-263987f6268439af69fcfa66a278103e1efe1343.tar.gz frameworks_base-263987f6268439af69fcfa66a278103e1efe1343.tar.bz2 | |
am 2a8ccd4b: am 1061652a: Merge "Revert "Make THEATER_MODE_ON setting a system api."" into lmp-mr1-dev
* commit '2a8ccd4b1f82086f6e38ec32ad084306400dcf93':
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 ef0f72f..3e75460 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"; /** |