am 6ee1bd42: Merge "Keep addWordToDictionary from doing disk I/O on main thread" into gingerbread

Merge commit '6ee1bd425bc44d91dbb151e999e9781bc301e632' into gingerbread-plus-aosp

* commit '6ee1bd425bc44d91dbb151e999e9781bc301e632':
  Keep addWordToDictionary from doing disk I/O on main thread