Adrian Roos c49dfaf4d6 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

2016-08-05 18:37:29 +00:00

..

android

Merge changes from topic 'smooth_unlock' into nyc-mr1-dev

2016-08-05 18:37:29 +00:00

google/android

…