From: John Spurlock Date: Mon, 27 Oct 2014 18:52:06 +0000 (+0000) Subject: am ab4fe2d9: am 9e51261d: am ae9d437b: Merge "Settings: Ensure CryptKeeper dismisses... X-Git-Tag: android-x86-6.0-r1~671^2~365 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=96cd925174f6c678b4242ccd4d8b5ccee94a81fc;p=android-x86%2Fpackages-apps-Settings.git am ab4fe2d9: am 9e51261d: am ae9d437b: Merge "Settings: Ensure CryptKeeper dismisses secure keyguards." into lmp-dev * commit 'ab4fe2d94fc1a0f142a390ef25ca64bc83fa17a0': --- 96cd925174f6c678b4242ccd4d8b5ccee94a81fc