Merge change I17b7ffe9

* changes:
  Do not back up / restore the END_BUTTON_BEHAVIOR setting

core/java/android/provider/Settings.java

+0 −1

Original line number	Diff line number	Diff line
		@@ -1447,7 +1447,6 @@ public final class Settings {
		*/
		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,