| commit | 4465744614cf865d45c161504d907024ced13479 | [log] [tgz] |
|---|---|---|
| author | Paul Lawrence <paullawrence@google.com> | Sun Oct 05 23:38:39 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sun Oct 05 23:38:39 2014 +0000 |
| tree | 36362b6a2f80f7e7d0150d02676c711c67deaac5 | |
| parent | 72498ed5c2657bb1b3a21435397b4a6bb266e995 [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