am d3e4dab9: Merge change I7df84618 into eclair

Merge commit 'd3e4dab962109c634196bc38fb9830c7b8cc1d0a' into eclair-mr2

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