am dcf99fbe: Merge change If4ff28ed into eclair-mr2

Merge commit 'dcf99fbe7ac981c4ef3c8def65213e148281547a' into eclair-mr2-plus-aosp

* commit 'dcf99fbe7ac981c4ef3c8def65213e148281547a':
  Cleanup one of the ListView sample demos.