Commits
Adam Powell authored and Android Git Automerger committed 91885b5528eM
am b0ed8bdb: Merge "Keyguard - prevent slider intercept when we don\'t want it" into jb-mr1-lockscreen-dev * commit 'b0ed8bdb41cff76f31ce47f1ae7ee51ea68bba47': Keyguard - prevent slider intercept when we don't want it
Showing diff to69d0686fdc2