OSDN Git Service

am 5bc2a2c0: am d56892da: Merge "Disable fingerprint after user lockout" into mnc...
authorAdrian Roos <roosa@google.com>
Wed, 26 Aug 2015 00:59:09 +0000 (00:59 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 26 Aug 2015 00:59:09 +0000 (00:59 +0000)
commitf90169d12b9654630740cd649b177c3bd6685190
tree666e0fea0aa3d42e1b469689a142537c46f8d2ef
parent742184528ba15d16d07e375129260856c0633073
parent5bc2a2c0ce2002f28147bba92abd4de40f8b7f3d
am 5bc2a2c0: am d56892da: Merge "Disable fingerprint after user lockout" into mnc-dr-dev

* commit '5bc2a2c0ce2002f28147bba92abd4de40f8b7f3d':
  Disable fingerprint after user lockout