From: Paul Lawrence <paullawrence@google.com>
Date: Sat, 19 Sep 2015 02:49:00 +0000 (+0000)
Subject: am 57ca15e4: am 0f1e7bfe: Merge "Revert "Remove don\'t kill flag from CryptKeeper... 
X-Git-Tag: android-x86-7.1-r1~1317^2~78
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=d1edd5318b46de5f4d28dca1954886660e05b972;p=android-x86%2Fpackages-apps-Settings.git

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"
---

d1edd5318b46de5f4d28dca1954886660e05b972