Merge branch 'qcril' into cm-10.2

Conflicts:
	src/com/android/mms/data/Conversation.java
	src/com/android/mms/transaction/MmsSystemEventReceiver.java