am 4b8ad9ef: Merge from gingerbread

* commit '4b8ad9effd95508e9966b8a3a355f0a948558ae2':
  Fix delivery report error with PENDING status in SMS