Jim Miller 8978d9acba 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"
2015-08-19 01:43:02 +00:00
..