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

Merge commit '929dc479b08fe5d1bf859054a8857c80acc6fd08'

* commit '929dc479b08fe5d1bf859054a8857c80acc6fd08':
tree: 3da3d0c16866eed943c51c33f3a73b80582d8014
  1. dictionaries/
  2. dictionary/
  3. res/
  4. src/
  5. Android.mk
  6. AndroidManifest.xml