Merge "Fix test breakage"
tree: befd7e4a2842cd79489273f487069a621e0277c0
  1. dictionaries/
  2. java/
  3. native/
  4. tests/
  5. tools/
  6. Android.mk
  7. CleanSpec.mk