Merge "Fix a bug ending in a NPE in some rare cases."
tree: 0516878e229c29b058ace1e666d46bbdc2ff9c90
  1. dictionaries/
  2. java/
  3. native/
  4. tests/
  5. tools/
  6. Android.mk
  7. CleanSpec.mk