am 40c0de64: Merge change 8836 into donut
am 40c0de64: Merge change 8836 into donut

Merge commit '40c0de641a64ed4db4f0a08448a7b58bc50a5425'

* commit '40c0de641a64ed4db4f0a08448a7b58bc50a5425':
  Add menu with search settings to search dialog.

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