| commit | b0ed8bdb41cff76f31ce47f1ae7ee51ea68bba47 | [log] [tgz] |
|---|---|---|
| author | Adam Powell <adamp@google.com> | Fri Oct 26 16:26:20 2012 -0700 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Fri Oct 26 16:26:20 2012 -0700 |
| tree | 05a02c7decfbb38819baa048324dfcc455d11747 | |
| parent | 113ca64a2275ad05c1429edcf56c688d823e308a [diff] | |
| parent | 995270f01175234d0615a0e1900576f142a3b4ad [diff] |
Merge "Keyguard - prevent slider intercept when we don't want it" into jb-mr1-lockscreen-dev