am 850d68b9: am f61dcf23: Merge change I718e813f into eclair

Merge commit '850d68b92344ca9bc6849829d3d27ed0136ed0d6' into eclair-mr2-plus-aosp

* commit '850d68b92344ca9bc6849829d3d27ed0136ed0d6':
  Fix for #2244624 : Keyboard freezes up sometimes