AJ Mod fix
Conflicts:
	res/values/strings.xml
	res/xml/device_info_settings.xml
	src/com/android/settings/DeviceInfoSettings.java