From: Jim Miller Date: Wed, 10 Sep 2014 22:18:22 +0000 (+0000) Subject: Merge "Keep unlock attempt count after configuration change" into lmp-dev X-Git-Tag: android-x86-6.0-r1~671^2~30^2~57^2~49 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=ca03758ed6399d73c841bec8685ea1f19bf38fea;p=android-x86%2Fpackages-apps-Settings.git Merge "Keep unlock attempt count after configuration change" into lmp-dev --- ca03758ed6399d73c841bec8685ea1f19bf38fea