Merge "[Prime-China] 100% Force Close occurred when select or tap email address"
Merge "Weird refresh in list of smses showing only numbers for a second"
am cdc2268b: Merge "[Prime-China] 100% Force Close occurred when select or tap email address"

* commit 'cdc2268b368ab7eef20198ad5525b50bebe5863f':
  [Prime-China] 100% Force Close occurred when select or tap email address
am 77d3c7e9: Merge "Weird refresh in list of smses showing only numbers for a second"

* commit '77d3c7e9963f551c9add7de09cab3bb58b595f17':
  Weird refresh in list of smses showing only numbers for a second
Merge "Handle the case where the recycler deletes a visible message Bug 5789152"
am 7367592a: Merge "Handle the case where the recycler deletes a visible message Bug 5789152"

* commit '7367592a9ce0a4482cc2bb248041d3543ec02f55':
  Handle the case where the recycler deletes a visible message Bug 5789152
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: I5d7807fe771231ff0e3a51f4d86359ed24ba1651
Merge "Remove some dialog icons and titles as per b/5446108."
Merge "Sent Message on fast reply has a strange number in the messaging app Bug 5765939"
am 636c0377: Merge "Remove some dialog icons and titles as per b/5446108."

* commit '636c0377b67b870a096902950e5b2776d3ad5fed':
  Remove some dialog icons and titles as per b/5446108.
am 5a3b82f2: Merge "Sent Message on fast reply has a strange number in the messaging app Bug 5765939"

* commit '5a3b82f21de865f9a436e4390f9b0553cd8b72a6':
  Sent Message on fast reply has a strange number in the messaging app Bug 5765939
merge in ics-release history after reset to master
Implement back intent on notifications

Bug 5214808

When the user selects a sms notification while in another app, they're
taken to the message conversation. Now when they tap back, they'll go
back to the conversation list. Tapping back again will take them back to
the activity they came from. This is the new standard in ICS.

Change-Id: I3a3dd97f6c895edd64656abf2995d17474950d11
Use libphonenumber for testing whether an address is a phone number

Bug 5855222
"Add to contacts" wasn't showing up in the ComposeMessageActivity menu
for German numbers containing slashes. The phone number checker in
Telephony.Mms.isPhoneNumber() is too simplistic. The code is now using
the sophisticated libphonenumber for testing phone numbers.

Change-Id: I6ea8c463e6bc7496e8c483c465b16ef860f2c9fc
am c0b938e8: Use libphonenumber for testing whether an address is a phone number

* commit 'c0b938e899f202ba9f4ac9bd2b5736b7f96c5b57':
  Use libphonenumber for testing whether an address is a phone number
Merge "Add sms test framework - SmsTest is the basic test class which can be extended by other tests - SmsStressTest stress sending/receiving messages, different size of   message and recipient can be passed through test runner" into ics-mr1
am f87f653c: Merge "Add sms test framework - SmsTest is the basic test class which can be extended by other tests - SmsStressTest stress sending/receiving messages, different size of   message and recipient can be passed through test runner" into ics-mr1

* commit 'f87f653c1cd9ad77f1b7b374c461022e367450fb':
  Add sms test framework - SmsTest is the basic test class which can be extended by other tests - SmsStressTest stress sending/receiving messages, different size of   message and recipient can be passed through test runner
am f87f653c: Merge "Add sms test framework - SmsTest is the basic test class which can be extended by other tests - SmsStressTest stress sending/receiving messages, different size of   message and recipient can be passed through test runner" into ics-mr1

* commit 'f87f653c1cd9ad77f1b7b374c461022e367450fb':
  Add sms test framework - SmsTest is the basic test class which can be extended by other tests - SmsStressTest stress sending/receiving messages, different size of   message and recipient can be passed through test runner
am 03664b24: am f87f653c: Merge "Add sms test framework - SmsTest is the basic test class which can be extended by other tests - SmsStressTest stress sending/receiving messages, different size of   message and recipient can be passed through test runner" into ics-mr1

* commit '03664b240f3b5d75af596cefe1984fbd53201c31':
  Add sms test framework - SmsTest is the basic test class which can be extended by other tests - SmsStressTest stress sending/receiving messages, different size of   message and recipient can be passed through test runner
am 97cb1579: am 03664b24: am f87f653c: Merge "Add sms test framework - SmsTest is the basic test class which can be extended by other tests - SmsStressTest stress sending/receiving messages, different size of   message and recipient can be passed through test runner" 

* commit '97cb1579923f63959e42f9469965178ee3efb0fc':
  Add sms test framework - SmsTest is the basic test class which can be extended by other tests - SmsStressTest stress sending/receiving messages, different size of   message and recipient can be passed through test runner