tree 53f5967fe30ceb87488e2623e801492f14ca879c
parent 92993a620b04008a764c52982b9981c1758d9e9e
parent 45e77ce36ae1d26bcf35afb1f7662d7b6fb08212
author Bjorn Bringert <bringert@android.com> 1260430497 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1260430497 -0800

am 45e77ce3: Merge change I154386b1 into eclair-mr2

Merge commit '45e77ce36ae1d26bcf35afb1f7662d7b6fb08212' into eclair-mr2-plus-aosp

* commit '45e77ce36ae1d26bcf35afb1f7662d7b6fb08212':
  Use unbundled QSB for global search