am b724617b: Merge "[CB22] Merge add and delete"

* commit 'b724617b41accc60ee12eb200d3b712c7a910997':
  [CB22] Merge add and delete
tree: e8d20b647b5a364c51f5315054d1dd6dab193f17
  1. dictionaries/
  2. java/
  3. native/
  4. tests/
  5. tools/
  6. Android.mk
  7. CleanSpec.mk