am b5868caa: am d3e4dab9: Merge change I7df84618 into eclair

Merge commit 'b5868caa8cfe4b3fb14c04f64a71c20a172faaef' into eclair-mr2-plus-aosp

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