Merge "Add SettingsActivity"
tree: 2cf166015fbe70fa5be5194ba868fc675aa0e0fd
  1. dictionaries/
  2. java/
  3. native/
  4. tests/
  5. tools/
  6. Android.mk
  7. CleanSpec.mk