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)
* commit 'bea9d7b94cfa16da8f257ed705e218b017d459a7':
  Reset fingerprint lockout timer when strong auth is used.

1  2 
core/res/AndroidManifest.xml

Simple merge