am 8079a812: Merge "Backup and restore battery saver trigger level" into lmp-mr1-dev

automerge: 80e5f45 * commit '80e5f45979416c0bee487725eaf4078b6ba42769': Backup and restore battery saver trigger level
2014-10-31 20:00:57 +00:00
parent 2a6749adc0 80e5f45979
commit 84df64d400
1 changed files with 2 additions and 1 deletions
--- a/core/java/android/provider/Settings.java
+++ b/core/java/android/provider/Settings.java
@@ -6629,7 +6629,8 @@ public final class Settings {
            WIFI_NUM_OPEN_NETWORKS_KEPT,
            EMERGENCY_TONE,
            CALL_AUTO_RETRY,
-            DOCK_AUDIO_MEDIA_ENABLED
+            DOCK_AUDIO_MEDIA_ENABLED,
+            LOW_POWER_MODE_TRIGGER_LEVEL
        };

        // Populated lazily, guarded by class object: