am 00f3d809: am a62a1926: am 471252b9: Merge "Fix a bug in multiple shortcut handling code." into jb-mr1-dev

* commit '00f3d8094733de407c9cd2669bf579a4d7740328':
  Fix a bug in multiple shortcut handling code.
tree: d37d56cbd49d3edfbf6bcc1c75bf4cbb9a059728
  1. dictionaries/
  2. java/
  3. native/
  4. tests/
  5. tools/
  6. Android.mk
  7. CleanSpec.mk