Try to fix Settings

Change-Id: I936cec6b8029332e721f6aef2ceee9035d8eb0c8

Conflicts:
	AndroidManifest.xml
	src/com/android/settings/Settings.java