Merge "Update keyboard settings wording" into jb-mr1-dev
tree: 3a2b1788b2a61cc6f7f98bd68ef6f28125e30e5c
  1. dictionaries/
  2. java/
  3. native/
  4. tests/
  5. tools/
  6. Android.mk
  7. CleanSpec.mk