| commit | c49dfaf4d6161471a68bbc08d947c5d697a507e2 | [log] [tgz] |
|---|---|---|
| author | Adrian Roos <roosa@google.com> | Fri Aug 05 18:37:27 2016 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Fri Aug 05 18:37:29 2016 +0000 |
| tree | 0282cd3481f79d0334c7ea0fbc4a0c8f600f2cf8 | |
| parent | b3690ccf2c3a5f63a7e46dbd17970d42cc788888 [diff] | |
| parent | ddcdecc9529bc4db7187458b09d15dcb1590825c [diff] |
Merge changes from topic 'smooth_unlock' into nyc-mr1-dev * changes: Keyguard: Improve trusted unlock while occluded Keyguard: Refactoring for improving trusted unlock while occluded