| commit | e11fbc08a340cb069c8034b7ffd794c32344d4ba | [log] [tgz] |
|---|---|---|
| author | Jim Miller <jaggies@google.com> | Tue Aug 18 20:15:10 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Aug 18 20:15:10 2015 +0000 |
| tree | 9dd859a790b7b0b8541f4711a27ec7ce3fcc3216 | |
| parent | 9b1fd822d07a5e3c270b76b197bec7ebfadb250d [diff] | |
| parent | 33a5c80773b7b2913c92fec170787499a453d184 [diff] |
am 33a5c807: resolved conflicts for merge of 448216e7 to mnc-dr-dev * commit '33a5c80773b7b2913c92fec170787499a453d184': Revert "Disable fingerprint when remotely reset by DPM"