am 463339f1: resolved conflicts for merge of aca5785a to master

* commit '463339f195b2e1bb649c0420af3f50715bb7206e':
  Fix Tamil keyboard
tree: af7df44d34ae6134da43791867777628efd7c87d
  1. dictionaries/
  2. java/
  3. native/
  4. tests/
  5. tools/
  6. Android.mk
  7. CleanSpec.mk