am 2d5a14d6: Merge change 22732 into eclair

Merge commit '2d5a14d6bf2bbc5a7e895cd4a0b977dd2f297532' into eclair-plus-aosp

* commit '2d5a14d6bf2bbc5a7e895cd4a0b977dd2f297532':
  clean up the too many deletes dialog