OSDN Git Service

am bea9d7b9: Merge "Reset fingerprint lockout timer when strong auth is used." into...
authorJim Miller <jaggies@google.com>
Tue, 18 Aug 2015 23:18:36 +0000 (23:18 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 18 Aug 2015 23:18:36 +0000 (23:18 +0000)
commit7ef772713fac5d7b69874f2b972cdec7a60f074b
treed50e3669c2ebd2f42898b30f15fae1c279ced538
parent2591d6ffc60505df0099069877f7913ec30e4460
parentbea9d7b94cfa16da8f257ed705e218b017d459a7
am bea9d7b9: Merge "Reset fingerprint lockout timer when strong auth is used." into mnc-dr-dev

* commit 'bea9d7b94cfa16da8f257ed705e218b017d459a7':
  Reset fingerprint lockout timer when strong auth is used.
core/res/AndroidManifest.xml