OSDN Git Service
(root)
/
android-x86
/
frameworks-base.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
30f3e95
e73074e
)
Merge "Use Scrypt to hash long passwords in RecoverableKeyStore" into pi-dev
author
Bo Zhu
<bozhu@google.com>
Wed, 4 Apr 2018 19:33:10 +0000
(12:33 -0700)
committer
android-build-merger
<android-build-merger@google.com>
Wed, 4 Apr 2018 19:33:10 +0000
(12:33 -0700)
am:
e73074e9a8
Change-Id: I50e3ee0083badc478dd9be5c647b351bfd2a840c
Trivial merge