OSDN Git Service

am 7639a6ab: Merge "Reset failed decryption count on successful decryptions" into...
authorPaul Lawrence <paullawrence@google.com>
Sun, 5 Oct 2014 23:27:41 +0000 (23:27 +0000)
committerAndroid 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

diff --cc cryptfs.c
Simple merge