am 6877060b: am 4afd8ff4: am 0874939e: am a8b838b4: Merge "Fix a test and crash with a better error message when reading"

* commit '6877060b7b99677dca84e8db33414ca23b118ad3':
tree: 4f215378dbc96e139e12902a3c5387a1ee112011
  1. dictionaries/
  2. java/
  3. native/
  4. tests/
  5. tools/
  6. Android.mk
  7. CleanSpec.mk