am f2ce81a8: am 9e590f21: am 88ee75d9: am 7818c9ff: am bab46b4a: am d96f63d2: am e2bee5b1: am ede3db51: Merge "Fix a crash on a secondary user" into jb-mr2-dev

* commit 'f2ce81a8bb3a01f0a32e9182b91f495fc22b8023':
main
Jean Chalard 2013-10-03 16:08:13 -07:00 committed by Android Git Automerger
commit 50261d5c45

Diff Content Not Available