am 86f77114: Merge "Don\'t auto-correct to non-whitelist shortcuts"

* commit '86f7711407b65c341b38a9fb297c3e5f0532da26':
  Don't auto-correct to non-whitelist shortcuts
tree: 9b6a08bedb9931abf1abc03114a4fbab50ec6f18
  1. dictionaries/
  2. java/
  3. native/
  4. tests/
  5. tools/
  6. Android.mk
  7. CleanSpec.mk