am 81c7192d: am 93a751d6: Merge change 23979 into eclair
am 81c7192d: am 93a751d6: Merge change 23979 into eclair

Merge commit '81c7192d335b7260914105578006ef662c3d641a'

* commit '81c7192d335b7260914105578006ef662c3d641a':
  Do a better job at finding the activity associated with a dialog when triggering search.

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