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