Merge "Do not register null pointers as dictionaries"
tree: c8626305e2cabaf4f68b436ac2848dccd1ad0d03
  1. dictionaries/
  2. java/
  3. native/
  4. tests/
  5. tools/
  6. Android.mk
  7. CleanSpec.mk