am 7b88af67: Merge "bug #2618035: applying Moto\'s patch to fix a...
am 7b88af67: Merge "bug #2618035: applying Moto\'s patch to fix a email/shortcode parsing bug." into froyo
Merge commit '7b88af67' into froyo-plus-aosp
* commit '7b88af67':
bug #2618035: applying Moto's patch to fix a email/shortcode parsing bug.