Merge commit '3f442ece257d416b48f7803a4cc263f0215faa0d' into gingerbread-plus-aosp * commit '3f442ece257d416b48f7803a4cc263f0215faa0d': Fix character count bug and Javadoc typos in SMS (with test cases)
Merge commit '3f442ece257d416b48f7803a4cc263f0215faa0d' into gingerbread-plus-aosp * commit '3f442ece257d416b48f7803a4cc263f0215faa0d': Fix character count bug and Javadoc typos in SMS (with test cases)