OSDN Git Service

Merge "Disable fingerprint after user lockout" into mnc-dr-dev
authorAdrian Roos <roosa@google.com>
Wed, 26 Aug 2015 00:43:31 +0000 (00:43 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Wed, 26 Aug 2015 00:43:31 +0000 (00:43 +0000)

Trivial merge