am d8b243fe: am d7e80b9d: Merge "fix NPE in getSearchBox" into honeycomb-mr1
am d8b243fe: am d7e80b9d: Merge "fix NPE in getSearchBox" into honeycomb-mr1

* commit 'd8b243fea28abda8b0a35b4698a7fe72c39fcace':
  fix NPE in getSearchBox

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