| commit | 8978d9acbaaa89be3c14ed758e7c8a8d06071779 | [log] [tgz] |
|---|---|---|
| author | Jim Miller <jaggies@google.com> | Wed Aug 19 01:43:02 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Aug 19 01:43:02 2015 +0000 |
| tree | a0bc57565d3c45966d8bf1a280024f310ef364c5 | |
| parent | 6041a68babcc0ec9cc2009fcfe75848882661785 [diff] | |
| parent | 309fef16e1494c80a54cbd0a59a98f32c512f845 [diff] |
am 309fef16: am e11fbc08: am 33a5c807: resolved conflicts for merge of 448216e7 to mnc-dr-dev * commit '309fef16e1494c80a54cbd0a59a98f32c512f845': Revert "Disable fingerprint when remotely reset by DPM"