From: Adrian Roos <roosa@google.com>
Date: Fri, 5 Aug 2016 18:37:27 +0000 (+0000)
Subject: Merge changes from topic 'smooth_unlock' into nyc-mr1-dev
X-Git-Tag: android-x86-7.1-r1~950^2~272
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=c49dfaf4d6161471a68bbc08d947c5d697a507e2;p=android-x86%2Fframeworks-base.git

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
---

c49dfaf4d6161471a68bbc08d947c5d697a507e2