diff options
| author | Adrian Roos <roosa@google.com> | 2016-08-05 18:37:27 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2016-08-05 18:37:29 +0000 |
| commit | c49dfaf4d6161471a68bbc08d947c5d697a507e2 (patch) | |
| tree | 0282cd3481f79d0334c7ea0fbc4a0c8f600f2cf8 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| 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
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions