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