am 6ec0cf12: Merge "Tentatively revert assets"

* commit '6ec0cf12b8f3dab05c48c81b1c0aaf5430d58c44':
  Tentatively revert assets
tree: 9f08a277bd861276bfe424263dbd2ffc16577275
  1. dictionaries/
  2. java/
  3. native/
  4. tests/
  5. tools/
  6. Android.mk
  7. CleanSpec.mk