am 9c9df277: MMS not displaying image or text after sending

* commit '9c9df2773645d195dbf17df91d7cccdf5154fe84':
  MMS not displaying image or text after sending
am 83f26a79: am 9c9df277: MMS not displaying image or text after sending

* commit '83f26a7933ac742c259fb431fac9561a0c507f62':
  MMS not displaying image or text after sending
am a52d364d: am 83f26a79: am 9c9df277: MMS not displaying image or text after sending

* commit 'a52d364dc7edfeb3d92ed9e787cd8e8f40a6bdc4':
  MMS not displaying image or text after sending
merge in jb-mr1-release history after reset to jb-mr1-dev
Reconcile with jb-mr1-release - do not merge

Change-Id: I0ca4d47873b4d34f91a36434a01e73b6f24c020c
am f42fead7: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit 'f42fead7ca4610ff72a84d6fd2214f83f970941f':
Import translations. DO NOT MERGE

Change-Id: I8c09ecb2c302442883c1706f433e657c18996b9c
Auto-generated-cl: translation import
Import translations. DO NOT MERGE

Change-Id: Ic3e26f1c048a1fd7cb4ff9fe8f3a9e2250a96e48
Auto-generated-cl: translation import
Import translations. DO NOT MERGE

Change-Id: I2dc7793a46692327e1b7ca381e4e2b678e008180
Auto-generated-cl: translation import
am 8e141446: Import translations. DO NOT MERGE

* commit '8e141446f4b1d11e342b128745fa383a798e0c5c':
  Import translations. DO NOT MERGE
am 259b5eab: Import translations. DO NOT MERGE

* commit '259b5eabd47d87f68bc1285e1de60747bf21fa2b':
  Import translations. DO NOT MERGE
am 2dbe407c: (-s ours) am 8e141446: Import translations. DO NOT MERGE

* commit '2dbe407cd77f30914d9f5e1ad6e7822f74a62189':
  Import translations. DO NOT MERGE
am 287493ff: am 259b5eab: Import translations. DO NOT MERGE

* commit '287493ffe8d7a4f4bc85bb5388097f066483fe09':
  Import translations. DO NOT MERGE
am 14f7c12d: (-s ours) am 287493ff: am 259b5eab: Import translations. DO NOT MERGE

* commit '14f7c12d7fc479daaf8509b628bfb29ff6a33cfc':
  Import translations. DO NOT MERGE
merge in jb-mr1-release history after reset to jb-mr1-dev
Reconcile with jb-mr1-release - do not merge

Change-Id: I6057356b05791923cbb6febfe3b6d3b4170cfbcb
am 68ae185f: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '68ae185f55db9e5d585ffcfd58a2b0652258d95b':
Add setting to turn on/off group MMS

Bug 6970173

Add a setting/preference to turn on/off group MMS. If group mms is disabled
by mms_config.xml, the preference is hidden from the user (this is consistent
with other mms features disabled by carriers). When group mms is disabled,
receiving a group mms is also disabled. In other words, the received message
will appear to have come from a thread with only the sender and not in a thread
with the sender + the other recipients.

Change-Id: I9510ae269f7b3968c768c7b5f5cf8dcc7fe4eca6
am 9889006f: Add setting to turn on/off group MMS

* commit '9889006f9d29d0509c1c036987ce028de43ac96e':
  Add setting to turn on/off group MMS
am e5f9d864: am 9889006f: Add setting to turn on/off group MMS

* commit 'e5f9d864a148a62b265c73eb66b8b0c1aa409ff2':
  Add setting to turn on/off group MMS