Merge "Fix NPE that happens only in some unit tests"
tree: dd6373e836b390241945acbcde8b4d8ac79e63b8
  1. dictionaries/
  2. java/
  3. native/
  4. tests/
  5. tools/
  6. Android.mk
  7. CleanSpec.mk