tree a0f1f6a1d617cf12816d4f85afdf3f7ba0edf5a9
parent d01fd604004011e25eb9e2814535950e566f7ad6
parent 6dd8a9351b651c8e85271660fcb2db80328a7b94
author Tom Taylor <tomtaylor@google.com> 1256830805 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1256830805 -0700

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

Merge commit '6dd8a9351b651c8e85271660fcb2db80328a7b94'

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