OSDN Git Service

Merge "FingerprintSettings should handle FINGERPRINT_ERROR_LOCKOUT_PERMANENT" into...
authorKevin Chyn <kchyn@google.com>
Tue, 20 Jun 2017 23:38:12 +0000 (23:38 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 20 Jun 2017 23:38:12 +0000 (23:38 +0000)
commit57d52c6b50cbe26eb63064adfe984525862e706a
tree11deba0dd358dfeee0cca80d9a697888645239e4
parent1d3f5e55cd3d3c70452adaa7316dba7d9e1ad482
parentb4bbc52e27da57f559052cee0936cb866ac9cd95
Merge "FingerprintSettings should handle FINGERPRINT_ERROR_LOCKOUT_PERMANENT" into oc-dr1-dev
am: b4bbc52e27

Change-Id: I7d9ba9fb5b1bd75a3565963bc13b82606761970b