Merge "Fix a crash on a secondary user" into jb-mr2-dev
tree: 13f40c1975f5f6482eeccebc07e539e6eec33066
  1. dictionaries/
  2. java/
  3. native/
  4. tests/
  5. tools/
  6. Android.mk
  7. CleanSpec.mk