tree 454feb3decd6612efda0d906bd1bc1762b285752
parent c061a10a8d9d313c118b12096f7f04b2949d42b3
parent 25c002871fd02117d229ce7bc2d9e57488ccfe88
author Brian Muramatsu <btmura@android.com> 1300734136 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1300734136 -0700

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

* commit '25c002871fd02117d229ce7bc2d9e57488ccfe88':
  update the NO_DELIVERY_REPORTS list