am 8579e25f: changed to use the new EntityIterator interface

Merge commit '8579e25faeedbb1d00ee295da4c74e45bd782573' into eclair-mr2-plus-aosp

* commit '8579e25faeedbb1d00ee295da4c74e45bd782573':
  changed to use the new EntityIterator interface