Merge commit '7d2511b722808dfc9cadd3f0f49375fcb738df56' into froyo-plus-aosp * commit '7d2511b722808dfc9cadd3f0f49375fcb738df56': Guard against NPE in SearchManagerService
Merge commit '7d2511b722808dfc9cadd3f0f49375fcb738df56' into froyo-plus-aosp * commit '7d2511b722808dfc9cadd3f0f49375fcb738df56': Guard against NPE in SearchManagerService