Merge "Don\'t back up/restore the "automatically restore app data" setting" into nyc-dev

am: 453951d077

* commit '453951d0777b1421e95bbcac501fb8b091c0f6a3':
  Don't back up/restore the "automatically restore app data" setting

Change-Id: Ia04215f6597dc3221bda438feb4921d53c1725fc
This commit is contained in:
Christopher Tate
2016-06-02 20:49:27 +00:00
committed by android-build-merger

View File

@@ -6250,7 +6250,6 @@ public final class Settings {
ACCESSIBILITY_DISPLAY_MAGNIFICATION_AUTO_UPDATE,
ACCESSIBILITY_SCRIPT_INJECTION,
ACCESSIBILITY_WEB_CONTENT_KEY_BINDINGS,
BACKUP_AUTO_RESTORE,
ENABLED_ACCESSIBILITY_SERVICES,
ENABLED_NOTIFICATION_LISTENERS,
ENABLED_VR_LISTENERS,