tree 714f635bb866f06d9516060e02977956bd8ab268
parent 7be1e2864136e87ad473f35e54a6795c4a58df8d
parent 6fdb85d383007e7d68895195d6347840276abeab
author Jim Miller <jaggies@google.com> 1438826274 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1438826274 +0000

am 6fdb85d3: am 120fc2c7: Merge "Disable fingerprint when remotely reset by DPM" into mnc-dev

* commit '6fdb85d383007e7d68895195d6347840276abeab':
  Disable fingerprint when remotely reset by DPM