OSDN Git Service
(root)
/
android-x86
/
system-vold.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
b69a5e4
7639a6a
)
am 7639a6ab: Merge "Reset failed decryption count on successful decryptions" into...
author
Paul Lawrence
<paullawrence@google.com>
Sun, 5 Oct 2014 23:27:41 +0000
(23:27 +0000)
committer
Android Git Automerger
<android-git-automerger@android.com>
Sun, 5 Oct 2014 23:27:41 +0000
(23:27 +0000)
* commit '
7639a6ab60426bbfa57c750c1ff0b4016cad0294
':
Reset failed decryption count on successful decryptions
1
2
cryptfs.c
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
cryptfs.c
Simple merge