Mms: goes TRDS 2.0

Change-Id: I1188564a0dcbd311e68b12f71ed759c3952132c1

Conflicts:
	res/values-cs/strings.xml
	res/values-da/strings.xml
	res/values-de/strings.xml
	res/values-el/strings.xml
	res/values-es/strings.xml
	res/values-fr/strings.xml
	res/values-hr/strings.xml
	res/values-hu/strings.xml
	res/values-it/strings.xml
	res/values-iw/strings.xml
	res/values-nl/strings.xml
	res/values-pt/strings.xml
	res/values-ro/strings.xml
	res/values-ru/strings.xml
	res/values-zh-rCN/strings.xml
	res/values/colors.xml
	res/values/strings.xml
	src/com/android/mms/quickmessage/QuickMessagePopup.java
	src/com/android/mms/ui/MessagingPreferenceActivity.java

Conflicts:
	res/values-fi/strings.xml
	res/values-ru/cm_strings.xml