Merge branch 'jb_mr2' of git://codeaurora.org/platform/packages/apps/Mms into qcril

Change-Id: Ic79f588aaf16548112a263e0b38f17b3cc7d652e

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