remove

This reverts commit 98d32ebd8cff5e1ee9d819f292d7b58cff1a676f.

Conflicts:
	core/java/android/provider/Settings.java
	packages/SystemUI/res/values/strings.xml

remove

This reverts commit 98d32ebd8cff5e1ee9d819f292d7b58cff1a676f.

Conflicts:
	core/java/android/provider/Settings.java
	packages/SystemUI/res/values/strings.xml