Merge branch 'qcril' of git://github.com/CyanogenMod/android_packages_apps_Mms into qcril

Conflicts:
	src/com/android/mms/data/Conversation.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/MessageListItem.java

Change-Id: I4cd4cd339aa1b95d08ebc28957b89b8970f55a71
Send 'reject call with sms' on the correct subscription.

Send sms on the subscription on which the call is rejected.
Get subscription info from the intent 'ACTION_RESPOND_VIA_MESSAGE'
on which the call is rejected.

Change-Id: Id12239184da6e539c2b39ea799a71bd441443e1a
CRs-Fixed: 594214
Cell Broadcast Support in Messaging app

- This feature is supported for India market where
  gsm.sim.operator.iso-country = in
- Cell broadcasts on channel 50 or 60 are displayed in Messaging
  app under SMS from "Cell Broadcast Channel"

Change-Id: Ie5a683f19d2ae7a4e7453494e6faa2db63e6ff82
CRs-Fixed: 576013

Conflicts:
	src/com/android/mms/transaction/SmsReceiverService.java
Fix to insert proper "from" address in MO MMS

In case of Multisim, add proper subscription info
to get proper "from" address while processing
MO MMS request.

Change-Id: Id6f6990c0a56e6f3d2450136d21570dfa5157082
CRs-Fixed: 596291
MMS: Redesign of Mms auto-retrieval feature.

- Introduce new mapping to facilitate optimized Dds switches.
- Introduce safe-guards to revert back to original subs.
- New implementation to handle various race conditios due to
  multiple MO/MT MMS operations on alternate subs.

Change-Id: I890ccc18657fef137051847cc816946355a26ed5
CRs-Fixed: 583518
Add receiver for cell broadcasts

Handle cell broadcast messages in a separate receiver to avoid
Phone app from requiring RECEIVE_EMERGENCY_BROADCAST permission
to send MT SMS to Mms app. RECEIVE_EMERGENCY_BROADCAST permission
is only required to be checked for cell broadcast messages

CRs-Fixed: 611756

Change-Id: I0662ce7d32f6c71c2f0d4086f9f7284ed61d39ee
(cherry picked from commit fda4902109ac69b958acf3ffb78ca3ade59fbf28)
Mms: Cleanup CAF additions

Change-Id: I441560973c3a36918702080d379b993a9cc063ef