am 491bb105: (-s ours) am cb004628: Merge "Make keyboard vertical correction configurable (DO NOT MERGE)" into gingerbread

Merge commit '491bb105ff07568a6bc4335b6c83de108086ec87'

* commit '491bb105ff07568a6bc4335b6c83de108086ec87':
  Make keyboard vertical correction configurable (DO NOT MERGE)