am 62cb40bb: Merge change Icaed50ed into eclair-mr2

Merge commit '62cb40bb634b00ab9d8f22b18afed4c44413e9eb' into eclair-mr2-plus-aosp

* commit '62cb40bb634b00ab9d8f22b18afed4c44413e9eb':
  Optimizing global search for contacts.