am 62318e1e: changed to use the new EntityIterator interface

Merge commit '62318e1ea8306142a10526534b7d83560ecf5b3a' into eclair-mr2-plus-aosp

* commit '62318e1ea8306142a10526534b7d83560ecf5b3a':
  changed to use the new EntityIterator interface