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