am 1328f4c4: am c8cb2c6e: am 0f34940e: Merge "[MR1] MMS: Fix Verizon IOT 2.6.1 fail [patch3]" into ics-mr1

* commit '1328f4c41f23be60889216f8eb5157ac3ed6ab68':
  [MR1] MMS: Fix Verizon IOT 2.6.1 fail [patch3]
am c385ea5b: Reconcile with ics-mr1-release

* commit 'c385ea5bc4868a005033af681dd7fd5890524fce':
am 7accfca5: am c385ea5b: Reconcile with ics-mr1-release

* commit '7accfca5f63aa4e00d5ad82804354d2bf3a04843':
merge in ics-release history after reset to master
am cdfa141c: am 758276fd: [Crespo-S] Message not able to be sent to a Korean number with a plus code in front (i.e. +82...)

* commit 'cdfa141c0a02bc75f0507a374ed95aa90c7aaf9e':
  [Crespo-S] Message not able to be sent to a Korean number with a plus code in front (i.e. +82...)
am 13b128ad: am cdfa141c: am 758276fd: [Crespo-S] Message not able to be sent to a Korean number with a plus code in front (i.e. +82...)

* commit '13b128add2d48a3778e53164abd5df2d2c8c97d2':
  [Crespo-S] Message not able to be sent to a Korean number with a plus code in front (i.e. +82...)
Crash in MMS on discarding a Message

Bug 5899557

There are two serious bugs here.
The first bug is that UriImage.getResizedImageData would get stuck in an
infinite loop when the picture data couldn't be decoded. Normally this loop
handles the case where an exception is thrown because the image is too big,
but in the case where the data is empty or perhaps corrupted, BitmapFactory.decodeStream
will return null and the code will end up in an infinite loop. This is done
in MmsSender in a background thread, so it doesn't affect the UI, but the
user sees that the sent message isn't showing up in the message list.
The second bug is when an exception is thrown, CMA puts up a dialog.
In the repro steps of this bug, backing out and the coming back in caused
this exception to be handled after (or during) the activity was finished.
I was easily able to repro this by hitting send and back quickly.

Change-Id: I3fe780119f15ef7d99dae45a3ebd2b4b56688e85
merge in ics-release history after reset to master
am 3d8877fa: Crash in MMS on discarding a Message

* commit '3d8877fa3e07c019d1779793ca0081beca177b6a':
  Crash in MMS on discarding a Message
merge in ics-mr1-release history after reset to ics-mr1
merge in ics-release history after reset to master
String w/o Description in TC -- Please update string .xml file

Bug 5651906

This is a test app. Mark all the strings as translatable=false.

Change-Id: I389c1166d8426f3ba4e4a07f187ea1ed2aaf8b71
am 5712a99b: String w/o Description in TC -- Please update string .xml file

* commit '5712a99b66d74f96a954246dc5641a71888b20fc':
  String w/o Description in TC -- Please update string .xml file
merge in jb-release history after reset to master
Merge "Date of delivery report not available anywhere"
am dd0c1d24: Merge "Date of delivery report not available anywhere"

* commit 'dd0c1d248bb72d95d596e0c4673bb6d36899609f':
  Date of delivery report not available anywhere
merge in jb-release history after reset to master
Not able to call a number that isn't saved in contacts, when pressing the call button from messaging app

Bug 5922602

Don't build the options menu until after the visibility of the recipients
editor is determined.

Change-Id: Ie70019808b130f5ac982285a48b537dce60ca914
am 2a2e37b3: Not able to call a number that isn\'t saved in contacts, when pressing the call button from messaging app

* commit '2a2e37b3cf7d67e837da1786dd677ce5dd2921d4':
  Not able to call a number that isn't saved in contacts, when pressing the call button from messaging app
am 2a2e37b3: Not able to call a number that isn\'t saved in contacts, when pressing the call button from messaging app

* commit '2a2e37b3cf7d67e837da1786dd677ce5dd2921d4':
  Not able to call a number that isn't saved in contacts, when pressing the call button from messaging app