am 6dd8a935: am 3fc145aa: Merge change Ie8672184 into eclair-mr2

Merge commit '6dd8a9351b651c8e85271660fcb2db80328a7b94'

* commit '6dd8a9351b651c8e85271660fcb2db80328a7b94':
  Add error code column to SMS