Merge branch 'qcril' into cm-10.2

Conflicts:
	AndroidManifest.xml
	src/com/android/mms/data/Conversation.java
	src/com/android/mms/quickmessage/QuickMessagePopup.java
	src/com/android/mms/transaction/MessagingNotification.java
	src/com/android/mms/transaction/SmsMessageSender.java
	src/com/android/mms/transaction/SmsReceiverService.java
	src/com/android/mms/ui/ComposeMessageActivity.java

Change-Id: I5820547da5f2f9f5614a408de227fc3abae194b7