OSDN Git Service

am 78195312: Merge "Disable fingerprint after force lock" into mnc-dr-dev
authorAdrian Roos <roosa@google.com>
Mon, 31 Aug 2015 20:31:13 +0000 (20:31 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 31 Aug 2015 20:31:13 +0000 (20:31 +0000)
commit4ec3b09192397d107da490bf7de52b76c5bd5b9f
tree2d8ecf9e7bba71146de54ea24d1e350d1b26a697
parentb116ccc13f31a9fa6ca8e5aba9bdb9c9ca326b70
parent781953123e5b0f0f85691eabc13b3430c3054a10
am 78195312: Merge "Disable fingerprint after force lock" into mnc-dr-dev

* commit '781953123e5b0f0f85691eabc13b3430c3054a10':
  Disable fingerprint after force lock