am ffc84355: Merge "Revert "Reorganize Keyboard settings screen""

* commit 'ffc843550c4d1ed96d26febd4be6239f0ecb487c':
  Revert "Reorganize Keyboard settings screen"
tree: 832c868ee0132da7942de116988ad7cd545bab81
  1. dictionaries/
  2. java/
  3. native/
  4. tests/
  5. tools/
  6. Android.mk
  7. CleanSpec.mk