am 8e5c6d70: am fd15686a: Merge "Fix an NPE"

* commit '8e5c6d709052ba13a4c1ebc08def8d563e7b149c':
  Fix an NPE
tree: df6c2583d0f91cf7136106a3c1bda45013b69615
  1. dictionaries/
  2. java/
  3. native/
  4. tests/
  5. tools/
  6. Android.mk
  7. CleanSpec.mk