am 3fc145aa: Merge change Ie8672184 into eclair-mr2

Merge commit '3fc145aafd4e04875ab3b67fed3429db30e15e48' into eclair-mr2-plus-aosp

* commit '3fc145aafd4e04875ab3b67fed3429db30e15e48':
  Add error code column to SMS