OSDN Git Service
(root)
/
android-x86
/
packages-apps-Settings.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
aec29ee
2e7b65f
)
Merge "Reset fingerprint lockout upon successful unlock" into oc-mr1-dev
author
Kevin Chyn
<kchyn@google.com>
Fri, 11 Aug 2017 17:34:35 +0000
(17:34 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Fri, 11 Aug 2017 17:34:35 +0000
(17:34 +0000)
am:
2e7b65f74a
Change-Id: I20ab95a2a6b677ac04cd46dbf89775f1cd8f071c
Trivial merge