am 89dfebe7: (-s ours) am 10aa8f12: am 9dcb764f: Fix "Show settings key" option on 7" device (DO NOT MERGE)

* commit '89dfebe7afdb412444e238044c72e6acf8fae577':
  Fix "Show settings key" option on 7" device (DO NOT MERGE)
tree: c1ea82531bdd7cc05ae2d10b7bd7c86bf2b610de
  1. dictionaries/
  2. java/
  3. native/
  4. tests/
  5. tools/
  6. Android.mk
  7. CleanSpec.mk