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