am 50261d5c: 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 '50261d5c45085fd18b4f12f88e219b9e843741ad':
main
Jean Chalard 2013-10-03 17:01:03 -07:00 committed by Android Git Automerger
commit 2487719365

Diff Content Not Available