Merge "Fix "Show settings key" option on 7" device"
tree: 17fd9338fa5e8493184f286401dca7ca39f2d0e3
  1. dictionaries/
  2. java/
  3. native/
  4. tests/
  5. tools/
  6. Android.mk
  7. CleanSpec.mk