Merge change I17b7ffe9

* changes:
  Do not back up / restore the END_BUTTON_BEHAVIOR setting
diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java
index 8c83303..947ab19 100644
--- a/core/java/android/provider/Settings.java
+++ b/core/java/android/provider/Settings.java
@@ -1447,7 +1447,6 @@
          */
         public static final String[] SETTINGS_TO_BACKUP = {
             STAY_ON_WHILE_PLUGGED_IN,
-            END_BUTTON_BEHAVIOR,
             WIFI_SLEEP_POLICY,
             WIFI_USE_STATIC_IP,
             WIFI_STATIC_IP,