Merge "Fix a test and crash with a better error message when reading"
tree: 1bfa185bfff19a88c30a6480903a668b16e66818
  1. dictionaries/
  2. java/
  3. native/
  4. tests/
  5. tools/
  6. Android.mk
  7. CleanSpec.mk