am f3ab5095: am a9adc0d5: Merge "update the NO_DELIVERY_REPORTS list" into gingerbread

* commit 'f3ab5095302eb632fa18ed31b841210278cb31de':
  update the NO_DELIVERY_REPORTS list