tree fd03295055a4189381421583f5c1bc22b8f6217e
parent 04f0524aa17ae1c010f3b327dd49f5164ba8d5ad
parent 40fa4070c70d9ddde681b2fb28627b8a4889080e
author Jim Miller <jaggies@google.com> 1438830207 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1438830207 +0000

am 40fa4070: am 4a66bbf7: am 5f96eb0c: am 6fdb85d3: am 120fc2c7: Merge "Disable fingerprint when remotely reset by DPM" into mnc-dev

* commit '40fa4070c70d9ddde681b2fb28627b8a4889080e':
  Disable fingerprint when remotely reset by DPM