am 36704bb8: am 91abf105: am b90a187d: Merge change Ie994c0e8 into eclair

Merge commit '36704bb8ffd433450994c0260c411bfa9424326d'

* commit '36704bb8ffd433450994c0260c411bfa9424326d':
  Update CdmaSmsTest unit test.