am 7d22534b: am 3f51f954: Merge "Fix a crash caused by SIP addresses...
am 7d22534b: am 3f51f954: Merge "Fix a crash caused by SIP addresses containing "%40" instead of "@"" into ics-mr1
* commit '7d22534b':
Fix a crash caused by SIP addresses containing "%40" instead of "@"