fix what merge removed

...

 Changes to be committed:
	modified:   res/values/strings.xml
	modified:   res/xml/device_info_settings.xml
	modified:   src/com/android/settings/DeviceInfoSettings.java