am 16419aca: am 7d2511b7: Merge "Guard against NPE in SearchManagerService" into froyo
am 16419aca: am 7d2511b7: Merge "Guard against NPE in SearchManagerService" into froyo

Merge commit '16419aca40e9d570eef4f51133ba1b734d3012c0' into kraken

* commit '16419aca40e9d570eef4f51133ba1b734d3012c0':
  Guard against NPE in SearchManagerService

xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base