Merge "Fix issue #6761130: Clearing app data in settings does not clear app's USB storage" into jb-dev
diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java
index a90dd8c..74c0a97 100644
--- a/core/java/android/provider/Settings.java
+++ b/core/java/android/provider/Settings.java
@@ -2041,9 +2041,6 @@
AUTO_TIME_ZONE,
TIME_12_24,
DATE_FORMAT,
- ACCELEROMETER_ROTATION,
- USER_ROTATION,
- HIDE_ROTATION_LOCK_TOGGLE_FOR_ACCESSIBILITY,
DTMF_TONE_WHEN_DIALING,
DTMF_TONE_TYPE_WHEN_DIALING,
EMERGENCY_TONE,