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:16:57 +0000 (20:16 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 31 Aug 2015 20:16:57 +0000 (20:16 +0000)
commit7e1775d246371422ae60ec4d825d70bc067a8962
tree6932df6c55592996b56eb5214565dfade963557b
parent02be93160a246323f0a17f831e4e8bf56d65d415
parent781953123e5b0f0f85691eabc13b3430c3054a10
am 78195312: Merge "Disable fingerprint after force lock" into mnc-dr-dev

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