am 2efb63ab: am 62cb40bb: Merge change Icaed50ed into eclair-mr2

Merge commit '2efb63ab6e051e95361bc4dd1c25b9acc2e7d7d1'

* commit '2efb63ab6e051e95361bc4dd1c25b9acc2e7d7d1':
  Optimizing global search for contacts.