Merge commit 'goog/master'
tree: 4031100140317994465a9d0840b573a7a7ae59b4
  1. dictionaries/
  2. java/
  3. native/
  4. tests/
  5. Android.mk
  6. CleanSpec.mk