am 25c00287: Merge "update the NO_DELIVERY_REPORTS list" into gingerbread

* commit '25c002871fd02117d229ce7bc2d9e57488ccfe88':
  update the NO_DELIVERY_REPORTS list