Merge commit 'b90a187d2cbbedcec87b479c9df7fd45804ad595' into eclair-plus-aosp * commit 'b90a187d2cbbedcec87b479c9df7fd45804ad595': Update CdmaSmsTest unit test.
Merge commit 'b90a187d2cbbedcec87b479c9df7fd45804ad595' into eclair-plus-aosp * commit 'b90a187d2cbbedcec87b479c9df7fd45804ad595': Update CdmaSmsTest unit test.