Merge "Fix a bug in multiple shortcut handling code." into jb-mr1-dev
tree: 730d9bb301ae0413c49648a89698cd4033418c11
  1. dictionaries/
  2. java/
  3. native/
  4. tests/
  5. tools/
  6. Android.mk
  7. CleanSpec.mk