tree 95001fa631a3dbcd7cba59435eb3a2f5f5c49308
parent b7fa0b65d789464f67b00d5975a9bc26460ce63c
parent baaaca1c6164eff17488a178859295a1d5be9171
author Jean-Baptiste Queru <jbq@google.com> 1296767555 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1296767555 -0800

am baaaca1c: Merge ee4c17ee from gingerbread

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