am c3ab855a: am e0ec5d42: Merge "Fix potential null pointer exeption in...
am c3ab855a: am e0ec5d42: Merge "Fix potential null pointer exeption in keyguard" into jb-mr1-lockscreen-dev
* commit 'c3ab855a':
Fix potential null pointer exeption in keyguard