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

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