am 15a01d72: Merge "Do not show key preview of settings and shortcut key" into ics-mr1

* commit '15a01d72724ce7f0a9a5814443a03b907962f3fd':
  Do not show key preview of settings and shortcut key
tree: 0e42e86f35c69fd5828a4aa0cafad0dbd05bef63
  1. dictionaries/
  2. java/
  3. native/
  4. tests/
  5. tools/
  6. Android.mk
  7. CleanSpec.mk