am 86780628: Merge "Fix an NPE."

* commit '8678062853291f46ea0b994375b251b6604c42a6':
  Fix an NPE.
tree: 058ee097894ebb51bc60efe5383f72953e56b2a5
  1. dictionaries/
  2. java/
  3. native/
  4. tests/
  5. tools/
  6. Android.mk
  7. CleanSpec.mk