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."
This commit is contained in:
Bryce Lee
2015-01-28 17:52:59 +00:00
committed by Android Git Automerger
2 changed files with 0 additions and 2 deletions

View File

@ -26872,7 +26872,6 @@ package android.provider {
field public static final java.lang.String SHOW_PROCESSES = "show_processes";
field public static final java.lang.String STAY_ON_WHILE_PLUGGED_IN = "stay_on_while_plugged_in";
field public static final java.lang.String SYS_PROP_SETTING_VERSION = "sys.settings_global_version";
field public static final java.lang.String THEATER_MODE_ON = "theater_mode_on";
field public static final java.lang.String TRANSITION_ANIMATION_SCALE = "transition_animation_scale";
field public static final java.lang.String USB_MASS_STORAGE_ENABLED = "usb_mass_storage_enabled";
field public static final java.lang.String USE_GOOGLE_MAIL = "use_google_mail";

View File

@ -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";
/**