OSDN Git Service

Merge "Disable fingerprint after force lock" into mnc-dr-dev
authorAdrian Roos <roosa@google.com>
Mon, 31 Aug 2015 20:04:46 +0000 (20:04 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Mon, 31 Aug 2015 20:04:46 +0000 (20:04 +0000)

Trivial merge