Merge branch 'cm-10.1' of git://github.com/CyanogenMod/android_packages_apps_Mms into jellybean2

Conflicts:
	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-hu/strings.xml
	res/values-it/strings.xml
	res/values-iw/strings.xml
	res/values-nl/strings.xml
	res/values-pl/strings.xml
	res/values-pt/strings.xml
	res/values-ru/strings.xml
	res/values-zh-rCN/strings.xml
	res/values/strings.xml
	src/com/android/mms/transaction/MessagingNotification.java
	src/com/android/mms/util/ThumbnailManager.java

'Merge update into cm-10.1'