am 5ac85462: Merge "Fix a NPE caused by a null typedWord" into honeycomb-mr1

* commit '5ac8546268a3c3cd2f523d086043d6200c553fa7':
  Fix a NPE caused by a null typedWord
tree: 8d16cd4b5a785cb275bdbd242ecd1b0c8a27c493
  1. dictionaries/
  2. java/
  3. native/
  4. tests/
  5. tools/
  6. Android.mk
  7. CleanSpec.mk