Merge commit 'goog/master'
tree: 9c3b5fabbb10fc32ae2c1741d872e81a7f7d47b2
  1. dictionaries/
  2. java/
  3. native/
  4. res/
  5. tests/
  6. Android.mk
  7. CleanSpec.mk