Add temasek version

Conflicts:

	res/values/strings.xml
	src/com/android/settings/DeviceInfoSettings.java