commit | 6bcac81e6a8db504dc32d89907f847b5a9118817 | [log] [tgz] |
---|---|---|
author | Paul Lawrence <paullawrence@google.com> | Sun Oct 05 23:27:41 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Sun Oct 05 23:27:41 2014 +0000 |
tree | 36362b6a2f80f7e7d0150d02676c711c67deaac5 | |
parent | b69a5e44db9b7ecf39b9441115f3470554062157 [diff] | |
parent | 7639a6ab60426bbfa57c750c1ff0b4016cad0294 [diff] |
am 7639a6ab: Merge "Reset failed decryption count on successful decryptions" into lmp-dev * commit '7639a6ab60426bbfa57c750c1ff0b4016cad0294': Reset failed decryption count on successful decryptions