Merge "Tentatively revert assets"
tree: 318fcd1c7c164be09c4eb1c561df030400597a4b
  1. dictionaries/
  2. java/
  3. native/
  4. tests/
  5. tools/
  6. Android.mk
  7. CleanSpec.mk