Merge remote-tracking branch 'aokp/jb-mr2' into jb-mr2

Conflicts:
	res/layout-inverted/compose_message_activity.xml
	res/mipmap-inverted-hdpi/ic_launcher_smsmms.png
	res/mipmap-inverted-mdpi/ic_launcher_smsmms.png
	res/mipmap-inverted-xhdpi/ic_launcher_smsmms.png
	res/mipmap-inverted-xxhdpi/ic_launcher_smsmms.png
	res/values-cs/strings.xml
	res/values-ja/strings.xml
	res/values-ru/strings.xml
	res/values-zh-rCN/strings.xml
	res/values/strings.xml
	res/xml/preferences.xml
	src/com/android/mms/data/Contact.java
	src/com/android/mms/transaction/MessagingNotification.java
	src/com/android/mms/transaction/MmsSystemEventReceiver.java
	src/com/android/mms/ui/ComposeMessageActivity.java
	src/com/android/mms/ui/ConversationList.java
	src/com/android/mms/ui/MessagingPreferenceActivity.java
	src/com/android/mms/ui/NumberPickerDialog.java

Change-Id: I864ad3803edc7b77bd062f5c92070ec65f52c955