am 62ad899f: am 087c0603: am 2b3970a2: Merge change Idc1396c8 into eclair
am 62ad899f: am 087c0603: am 2b3970a2: Merge change Idc1396c8 into eclair

Merge commit '62ad899fa6edb7311eb4f6e0dc2da7e354ce359f'

* commit '62ad899fa6edb7311eb4f6e0dc2da7e354ce359f':
  Only use FLAG_ACTIVITY_CLEAR_TOP on the search intent when from global 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