am 13a6c8c1: am 1508c0e8: Add a new preference item to show/hide the settings key.

Merge commit '13a6c8c1f8691b753cd1a6b7a77d99af4f7d78ac'

* commit '13a6c8c1f8691b753cd1a6b7a77d99af4f7d78ac':
  Add a new preference item to show/hide the settings key.
tree: acce0c782e8de48cc7953ff4bf7cca8396273532
  1. dictionaries/
  2. java/
  3. native/
  4. tests/
  5. Android.mk
  6. CleanSpec.mk