am 84400f65: am bb6f9146: (-s ours) DO NOT MERGE: Fix for 2295810:...
am 84400f65: am bb6f9146: (-s ours) DO NOT MERGE: Fix for 2295810: Auto-correction of English results in Englishman
Merge commit '84400f65' into eclair-mr2-plus-aosp
* commit '84400f65':
DO NOT MERGE: Fix for 2295810: Auto-correction of English results in Englishman