tree c7ee72a03f9c8d344ece09a47768112b43186f4b
parent 90c6aec10f969acf9b171b82920480fb6aeb007f
parent fdf3b26ba78ed308f45a2c6f79a5f977663ac3c8
author Wei Huang <weih@google.com> 1271979220 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1271979220 -0700

Merge "bug #2618035: applying Moto's patch to fix a email/shortcode parsing bug." into froyo