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

* commit 'aedc5a63259fb110a9636513c423664e3ad3ce60':
  update the NO_DELIVERY_REPORTS list