Merge remote-tracking branch 'remotes/aosp/jb-mr1.1-release' into jb-4.2

Conflicts:
	res/xml/preferences.xml
	src/com/android/mms/transaction/MessagingNotification.java
	src/com/android/mms/ui/MessagingPreferenceActivity.java

Conflicts:

	src/com/android/mms/ui/MessagingPreferenceActivity.java