Merge "Fix settings key icon"
tree: 95dc3ddb6ab8c115b63fab8da955ca8ed766c5f8
  1. dictionaries/
  2. java/
  3. native/
  4. tests/
  5. tools/
  6. Android.mk
  7. CleanSpec.mk