am f500d64a: am 2d5a14d6: Merge change 22732 into eclair

Merge commit 'f500d64a75cb4b593756f38043c47134fdc316bf'

* commit 'f500d64a75cb4b593756f38043c47134fdc316bf':
  clean up the too many deletes dialog