am 95c98dd5: Merge change Ie69a9c0a into eclair

Merge commit '95c98dd5fd5920933231c424ff53f91adeee9503' into eclair-plus-aosp

* commit '95c98dd5fd5920933231c424ff53f91adeee9503':
  Remove globalSearch argument from triggerSearch()