am a4323999: am 3448b676: am 9e4c8561: Merge change I8d48149c into eclair
am a4323999: am 3448b676: am 9e4c8561: Merge change I8d48149c into eclair

Merge commit 'a4323999ecfaef42c70eec39b6a8f0bfcfaf2394'

* commit 'a4323999ecfaef42c70eec39b6a8f0bfcfaf2394':
  Don't reinflate search bar when dialog is already showing

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