am 88b5953a: Merge "NULL inputType text fields should never show the IME." into honeycomb

* commit '88b5953ab2f63ed6f820bb13845cf8fecb2d57e3':
  NULL inputType text fields should never show the IME.