Merge commit '45e77ce36ae1d26bcf35afb1f7662d7b6fb08212' into eclair-mr2-plus-aosp * commit '45e77ce36ae1d26bcf35afb1f7662d7b6fb08212': Use unbundled QSB for global search
Merge commit '45e77ce36ae1d26bcf35afb1f7662d7b6fb08212' into eclair-mr2-plus-aosp * commit '45e77ce36ae1d26bcf35afb1f7662d7b6fb08212': Use unbundled QSB for global search