Sent Message on fast reply has a strange number in the messaging app

Bug 5765939

The CountryCode was not getting initialized until the country actually changed.
As a result, numbers were getting formatted based on the locale's country,
instead of the actual country.

Change-Id: I2e930d379ef407ec4de6c3318c709ec424af731e
Merge "Sent Message on fast reply has a strange number in the messaging app" into ics-mr1
am 40eded11: Merge "Sent Message on fast reply has a strange number in the messaging app" into ics-mr1

* commit '40eded1110c2a86106f81ace36244755fcb53e97':
  Sent Message on fast reply has a strange number in the messaging app
merge in ics-mr1-release history after reset to ics-mr1
[MR1] MMS: Fix Verizon IOT 2.6.1 fail [patch3]

patch3: change local variable name for understanding

Add exception handling when MMSC send 404: file not found
for retrieving mms. Show error message and do not retry to
retrieve.
This is Verizon MMS IOT test case. They remove MMS from MMSC
before try to retrieve MMS.

Bug: 5245918

Change-Id: I2546db94b2ce2e2cdd7f1667a30b82e926d1b132
Signed-off-by:  <goodsc.lee@samsung.com>
Merge "[MR1] MMS: Fix Verizon IOT 2.6.1 fail [patch3]" into ics-mr1
am 0f34940e: Merge "[MR1] MMS: Fix Verizon IOT 2.6.1 fail [patch3]" into ics-mr1

* commit '0f34940e938ff70feaa1eb4097e75b152d42bc7d':
  [MR1] MMS: Fix Verizon IOT 2.6.1 fail [patch3]
merge in ics-mr1-release history after reset to ics-mr1
Reconcile with ics-mr1-release

Change-Id: Ie21392ae78a3447dd8c54f4a89c2bb2352b21960
[Crespo-S] Message not able to be sent to a Korean number with a plus code in front (i.e. +82...)

Bug 5800721

Remove separators from numbers before passing them to the SmsManager.
For numbers like "+8211-111-1111", Sprint will send back an SMS saying
the destination is invalid. By removing the separators ("-"), the number
sends fine.

Change-Id: I890a5c25063288e0527a468b65bcc26b00b57892
am 758276fd: [Crespo-S] Message not able to be sent to a Korean number with a plus code in front (i.e. +82...)

* commit '758276fd1342cb573f9fb6bcff7ce427b2f411d0':
  [Crespo-S] Message not able to be sent to a Korean number with a plus code in front (i.e. +82...)
merge in ics-mr1-release history after reset to ics-mr1
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
merge in ics-mr1-release history after reset to ics-mr1
Reconcile with ics-mr1-release

Change-Id: Ic5e3198f66c749c7a2a19f6b8140ce8b76856276
Use name and number for SMS delivery reports

Switched SMS delivery reports to display both
name and number of the contact instead of just
displaying their number.

I also switched to using Context.getString() instead
of String.format and also added brackets to the if
statements to follow the Android coding style.

Change-Id: Icb95712714523c2ac465835eeb94a99865fae0c3
Signed-off-by: Alexander Blom <alexvem@gmail.com>
Import translations. DO NOT MERGE

Change-Id: Ia0fa96741cd7df293c4e8ada1475f87d9aae7721
am f14ffacd: Import translations. DO NOT MERGE

* commit 'f14ffacdb739714f59c99187d02a40aa2e3610ce':
  Import translations. DO NOT MERGE
merge in ics-mr1-release history after reset to ics-mr1