am 55fd212f: am c0e1f268: Merge "Fix issue #7184877: Calendar Locksceen Widget...
am 55fd212f: am c0e1f268: Merge "Fix issue #7184877: Calendar Locksceen Widget crashes and forces phone to reboot" into jb-mr1-dev
* commit '55fd212f':
Fix issue #7184877: Calendar Locksceen Widget crashes and forces phone to reboot