OSDN Git Service

am e11fbc08: am 33a5c807: resolved conflicts for merge of 448216e7 to mnc-dr-dev
authorJim Miller <jaggies@google.com>
Wed, 19 Aug 2015 01:31:58 +0000 (01:31 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 19 Aug 2015 01:31:58 +0000 (01:31 +0000)
commit309fef16e1494c80a54cbd0a59a98f32c512f845
tree3be27c35ca505cf01eb1a4a89c0c76c0b5b97706
parent458d4d6d7fa8d4e76674a32c240bdbd7701a86dc
parente11fbc08a340cb069c8034b7ffd794c32344d4ba
am e11fbc08: am 33a5c807: resolved conflicts for merge of 448216e7 to mnc-dr-dev

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