From: Paul Lawrence Date: Thu, 24 Jul 2014 21:45:01 +0000 (+0000) Subject: Merge "Show countdown of remaining decrypt attempts before wiping device" into lmp-dev X-Git-Tag: android-x86-6.0-r1~860^2~701 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=832ad720;p=android-x86%2Fpackages-apps-Settings.git Merge "Show countdown of remaining decrypt attempts before wiping device" into lmp-dev --- 832ad7206299be6db94e82e2387c0fcf8df53e7e