am ccb2bc6c: (-s ours) am e0a82fcc: am 241c000c: Merge "Fix InputType determination of WebTextView (DO NOT MERGE)" into honeycomb-mr2

* commit 'ccb2bc6c155c09e88e4fbbbd30382ae58c087ce5':
  Fix InputType determination of WebTextView (DO NOT MERGE)