am a6047aae: Merge "Set the shortcut frequency correctly."

* commit 'a6047aae941e0723367fa9c52157271eb405b6fb':
  Set the shortcut frequency correctly.
tree: abe50cb09bc81a7b4585c3ad2877b3e40df01270
  1. dictionaries/
  2. java/
  3. native/
  4. tests/
  5. tools/
  6. Android.mk
  7. CleanSpec.mk