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)
commit6bcac81e6a8db504dc32d89907f847b5a9118817
tree36362b6a2f80f7e7d0150d02676c711c67deaac5
parentb69a5e44db9b7ecf39b9441115f3470554062157
parent7639a6ab60426bbfa57c750c1ff0b4016cad0294
am 7639a6ab: Merge "Reset failed decryption count on successful decryptions" into lmp-dev

* commit '7639a6ab60426bbfa57c750c1ff0b4016cad0294':
  Reset failed decryption count on successful decryptions
cryptfs.c