am ede3db51: Merge "Fix a crash on a secondary user" into jb-mr2-dev

* commit 'ede3db51f0fb16559c27aa29a7cf07784bb9431c':
  Fix a crash on a secondary user
tree: 006d03d11eff1b770f0318ed0b480485d71c58c2
  1. dictionaries/
  2. java/
  3. native/
  4. tests/
  5. tools/
  6. Android.mk
  7. CleanSpec.mk