Merge "Fixes to json output"
tree: 4535cc48498a2230125053dd86cfc70b30bac9fd
  1. dictionaries/
  2. java/
  3. native/
  4. tests/
  5. tools/
  6. Android.mk
  7. CleanSpec.mk