am dbb3b98a: am 86780628: Merge "Fix an NPE."

* commit 'dbb3b98a1d6104f4d1e816400538db050015422d':
tree: 47a89f012ad5e2ba2bbb300f809b2354914163f9
  1. dictionaries/
  2. java/
  3. native/
  4. tests/
  5. tools/
  6. Android.mk
  7. CleanSpec.mk