9666bbdf1b
Merge commit '7b88af679a9a3b5737343bb996ef392b76d19e73' into froyo-plus-aosp * commit '7b88af679a9a3b5737343bb996ef392b76d19e73': bug #2618035: applying Moto's patch to fix a email/shortcode parsing bug.