Merge commit '91abf105206f2ba19e886909456b3e3b7ed19362' into eclair-mr2-plus-aosp * commit '91abf105206f2ba19e886909456b3e3b7ed19362': Update CdmaSmsTest unit test.
Merge commit '91abf105206f2ba19e886909456b3e3b7ed19362' into eclair-mr2-plus-aosp * commit '91abf105206f2ba19e886909456b3e3b7ed19362': Update CdmaSmsTest unit test.