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

* commit 'bab46b4ae28fb9807bc2c5a656468cc4fdc08b3c':
main
Jean Chalard 2013-09-26 03:22:11 -07:00 committed by Android Git Automerger
commit 7818c9ff2e

Diff Content Not Available