am 84400f65: am bb6f9146: (-s ours) DO NOT MERGE: Fix for 2295810: Auto-correction of English results in Englishman

Merge commit '84400f65ab4a1526ce47bcd4b84edf4b64b78e18' into eclair-mr2-plus-aosp

* commit '84400f65ab4a1526ce47bcd4b84edf4b64b78e18':
  DO NOT MERGE: Fix for 2295810: Auto-correction of English results in Englishman