Merge commit 'android-4.2.2_r1' into mr1.1-staging

Conflicts:
	res/values-de/strings.xml
	res/values-pl/strings.xml
	res/values-zh-rCN/strings.xml
	res/xml/preferences.xml
	src/com/android/mms/transaction/MessagingNotification.java
	src/com/android/mms/ui/MessagingPreferenceActivity.java

Change-Id: If2cad66bbe0470ee86162cbe3fc5466056a2cd52