Reconcile with jb-mr1-release - do not merge

Change-Id: Id3157ca77b5d15212de07d443e5f26a2c4db80fa
am 733fcced: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '733fccedb2c26f5f725aa4aba525063fd779e9f1':
  Unable to receive MMS on Mako
am a67e3955: Optionally create threadid

* commit 'a67e3955994a976ab5fafceb86055d98a100bcc0':
  Optionally create threadid
am aabf40bb: am a67e3955: Optionally create threadid

* commit 'aabf40bbd43fd3340a56833f92eb23fac9df5df1':
  Optionally create threadid
am 23480fbe: Group MMS flickers between white square and received message when initially checking

* commit '23480fbe75113d2658cc5437d9b0745de17c8faf':
  Group MMS flickers between white square and received message when initially checking
am 7a083b69: am 23480fbe: Group MMS flickers between white square and received message when initially checking

* commit '7a083b69466d207a427d77d6d84b1b7406849185':
  Group MMS flickers between white square and received message when initially checking
Reconcile with jb-mr1-release - do not merge

Change-Id: I17f75cece44e1e9dfe9707346ee7168ca0f0a654
am 2219bd26: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '2219bd26bde084d4703cab9bb85982e41ad01f28':
am ab17014b: Support group mms setting

* commit 'ab17014baf326d69a5bfd153622a1d7da6a4f9ce':
  Support group mms setting
am a7fc89ae: am ab17014b: Support group mms setting

* commit 'a7fc89ae6184eb8b92fd229e45ffa0bbe7bbf1da':
  Support group mms setting
merge in jb-mr1-factory-release history after reset to jb-mr1-dev
Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge

Change-Id: Ic06ba79213c8ce2c41c8282a333456fd8304636b
am 15480409: (-s ours) Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge

* commit '15480409f3b085b3292af0ec894d2bed2bc147a2':
merge in jb-mr1-factory-release history after reset to jb-mr1-dev
am e1f17ce8: MMS creates a new thread when receiver is not in the Message thread

* commit 'e1f17ce8cd1f968b1273938a05ef9237862827d4':
  MMS creates a new thread when receiver is not in the Message thread
am ee2a5e9d: am e1f17ce8: MMS creates a new thread when receiver is not in the Message thread

* commit 'ee2a5e9d14a0f1d02037c18a7c07f87b308b2cae':
  MMS creates a new thread when receiver is not in the Message thread
Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge

Change-Id: Iaffda05bc8f285a7b4fdb8477608f228a42733f6
am 9155fe81: (-s ours) Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge

* commit '9155fe81a9844b78f90f340dad36c106768aae6b':
am 34d50cb7: Empty draft created on deleting a group MMS message

* commit '34d50cb71769cc37fd733722ca2891bf9e364da6':
  Empty draft created on deleting a group MMS message
am 1f6dc6d4: am 34d50cb7: Empty draft created on deleting a group MMS message

* commit '1f6dc6d4e51431c8c825753bcfdef4d001dc99a2':
  Empty draft created on deleting a group MMS message