Merge "Revert "[CB22] Merge add and delete""
tree: c61fab457ffebdc55258a9336225af81a89e6130
  1. dictionaries/
  2. java/
  3. native/
  4. tests/
  5. tools/
  6. Android.mk
  7. CleanSpec.mk