OSDN Git Service

am d56892da: Merge "Disable fingerprint after user lockout" into mnc-dr-dev
authorAdrian Roos <roosa@google.com>
Wed, 26 Aug 2015 00:51:02 +0000 (00:51 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 26 Aug 2015 00:51:02 +0000 (00:51 +0000)
* commit 'd56892da195b183bb5205a0c526bd730fb8a672f':
  Disable fingerprint after user lockout


Trivial merge