tree f213f9eff9a008feca6ae98f30b6bd324bb02ae4
parent 4080a4197c8c900e0f597bf436f2f79cc76f2c93
parent 8978d9acbaaa89be3c14ed758e7c8a8d06071779
author Jim Miller <jaggies@google.com> 1439950906 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1439950906 +0000

am 8978d9ac: am 309fef16: am e11fbc08: am 33a5c807: resolved conflicts for merge of 448216e7 to mnc-dr-dev

* commit '8978d9acbaaa89be3c14ed758e7c8a8d06071779':
  Revert "Disable fingerprint when remotely reset by DPM"