Merge "Fix a native crash with shortcuts"
tree: b1b1b8a5398e8af60c95c16634390ba1393a2d1f
  1. dictionaries/
  2. java/
  3. native/
  4. tests/
  5. tools/
  6. Android.mk
  7. CleanSpec.mk