am 57bb26f8: Force in-call notification to be shown if "voice privacy" is active

* commit '57bb26f8da77cbdc13995f472a40df566599326c':
  Force in-call notification to be shown if "voice privacy" is active
am 1814dac7: am 57bb26f8: Force in-call notification to be shown if "voice privacy" is active

* commit '1814dac7a345ee07db0e0704944594fdc8cbbe75':
  Force in-call notification to be shown if "voice privacy" is active
Merge "Use default vibration for MWI."
am 68a38b59: Merge "Use default vibration for MWI."

* commit '68a38b59d51c1b42ec47fef25728363592fa7327':
  Use default vibration for MWI.
merge in ics-release history after reset to master
Import revised translations.  DO NOT MERGE

Change-Id: I65664fe25172584a4b2f0a06743f8370409d43be
am 5b0b3128: (-s ours) Import revised translations.  DO NOT MERGE

* commit '5b0b31289550ccde310c4cfa32d101bbf80e57d9':
  Import revised translations.  DO NOT MERGE
am 23c8153f: (-s ours) am 5b0b3128: (-s ours) Import revised translations.  DO NOT MERGE

* commit '23c8153f0fa091f4a6ee8ce3ad7eb245271491de':
  Import revised translations.  DO NOT MERGE
Import revised translations.

Change-Id: Ib02b223f72b346e75283bbb6e0eb7ce7b8983a53
Merge "Import revised translations."
am 59f28cc6: Merge "Import revised translations."

* commit '59f28cc6f3935db1b4539dab229e308a96e70799':
  Import revised translations.
Use correct assets for dial_1 and dial_0 buttons

Bug: 5452925
Change-Id: I649f16d67d2481d4f175909a58f0b0d1fd6c9022
am 6c24064f: Use correct assets for dial_1 and dial_0 buttons

* commit '6c24064f658d6bb3428e1c073983ed5810eea10c':
  Use correct assets for dial_1 and dial_0 buttons
merge in ics-release history after reset to master
Handle waiting call in CDMA phone.

Since CDMA network does not always support hold an active call,
we will "answer incoming and end ongoing call" while there is
a SIP incoming call and a CDMA ongoing call (or CDMA incoming
call and a SIP ongoing call). Basically we prevent the swap
between SIP and CDMA calls.

bug:5226658
Change-Id: I46d89029328665b5640c12fb29e5cbd976dfe6c1
Merge "Handle waiting call in CDMA phone." into ics-mr0
am 77e47c39: Merge "Handle waiting call in CDMA phone." into ics-mr0

* commit '77e47c39d6790501a30170af37411d560bd42d15':
  Handle waiting call in CDMA phone.
am 0f7a8f5f: am 77e47c39: Merge "Handle waiting call in CDMA phone." into ics-mr0

* commit '0f7a8f5f307178d35d9ac518928850404bb8b06b':
  Handle waiting call in CDMA phone.
Fix ultra-long phone numbers overlapping the elapsed time widget

TESTED: Contacts with ultra-long names, ultra-long numbers, and both.

Bug: 5476689
Change-Id: I3dd01296574a5dce5cfd618ad3bb43af5bdf437d
am f95d07b7: Fix ultra-long phone numbers overlapping the elapsed time widget

* commit 'f95d07b735ad74cd17300f716c6cd059a3bf3317':
  Fix ultra-long phone numbers overlapping the elapsed time widget