Merge "Revert inconsistent assets"
tree: 32b053237d7e09afde8cae8061f4683a43f55873
  1. dictionaries/
  2. java/
  3. native/
  4. tests/
  5. tools/
  6. Android.mk
  7. CleanSpec.mk