am f214dd9d: am f14da417: Merge change I3ff560d7 into eclair

Merge commit 'f214dd9d4f9f5f923a77aa91cd8cf3efa5bc3765' into eclair-mr2-plus-aosp

* commit 'f214dd9d4f9f5f923a77aa91cd8cf3efa5bc3765':
  Send "encoding problem" to the network for general errors during SMS dispatch.