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

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