From: John Spurlock Date: Wed, 17 Sep 2014 20:01:36 +0000 (+0000) Subject: am 7dfc3540: am 0f01eb7f: am ae9d437b: Merge "Settings: Ensure CryptKeeper dismisses... X-Git-Tag: android-x86-6.0-r1~671^2~21^2~395 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=7cd016e3e0a6256b38f3f64423c0d90e63a873bc;p=android-x86%2Fpackages-apps-Settings.git am 7dfc3540: am 0f01eb7f: am ae9d437b: Merge "Settings: Ensure CryptKeeper dismisses secure keyguards." into lmp-dev * commit '7dfc3540a33c0bf53227db86ce193dc8ef0f02f4': Settings: Ensure CryptKeeper dismisses secure keyguards. --- 7cd016e3e0a6256b38f3f64423c0d90e63a873bc