am 91885b55: am b0ed8bdb: Merge "Keyguard - prevent slider intercept when we...
am 91885b55: am b0ed8bdb: Merge "Keyguard - prevent slider intercept when we don\'t want it" into jb-mr1-lockscreen-dev
* commit '91885b55':
Keyguard - prevent slider intercept when we don't want it