tree 9f0ad45a2a34571d1c2b88b83ba51e3639473c28
parent 06fb3b2da8a57fdc5efe24ab9464e6e890740de6
parent 0cb50efdc2d3ecaa9f1b2163109e8fff1b23f0e7
author Adrian Roos <roosa@google.com> 1441051486 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1441051486 +0000

Merge "Disable fingerprint after force lock" into mnc-dr-dev