| commit | d1edd5318b46de5f4d28dca1954886660e05b972 | [log] [tgz] |
|---|---|---|
| author | Paul Lawrence <paullawrence@google.com> | Sat Sep 19 02:49:00 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sat Sep 19 02:49:00 2015 +0000 |
| tree | 0b8e7139e0cb5eaf5b6dcc2493aebea2a17b494b | |
| parent | 2b6208599d5cd606cc3a685f6ae3d5b9acf5553b [diff] | |
| parent | 57ca15e45e2bac389d77173084b91de2551dc407 [diff] |
am 57ca15e4: am 0f1e7bfe: Merge "Revert "Remove don\'t kill flag from CryptKeeper to stop logspam"" into mnc-dr-dev * commit '57ca15e45e2bac389d77173084b91de2551dc407': Revert "Remove don't kill flag from CryptKeeper to stop logspam"