Merge change I6c27819c into eclair-mr2

* changes:
  Fix for #2185627 : ArrayIndexOutOfBounds in BinaryDictionary.getWords()
tree: fa30331304004bfda1dc2d73bfc5889451fbebd8
  1. dictionaries/
  2. dictionary/
  3. res/
  4. src/
  5. Android.mk
  6. AndroidManifest.xml