am 46b7bfa3: - create a Uri for and expose the contacts entities uri - change the EntityIterator to use that Uri - fix the column naming in the entities view

Merge commit '46b7bfa3728bf878d1a9dac9fea35fa629975e1b' into eclair-plus-aosp

* commit '46b7bfa3728bf878d1a9dac9fea35fa629975e1b':
  - create a Uri for and expose the contacts entities uri