am 0d8aa05d: am b5868caa: am d3e4dab9: Merge change I7df84618 into eclair
am 0d8aa05d: am b5868caa: am d3e4dab9: Merge change I7df84618 into eclair

Merge commit '0d8aa05d306205850e3014550bce34735ac78660'

* commit '0d8aa05d306205850e3014550bce34735ac78660':
  Add a privateImeOption to represent that the IME should not show

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