From: Robin Lee Date: Wed, 11 Mar 2015 18:47:48 +0000 (+0000) Subject: Merge "Don't reset the keystore during password change" X-Git-Tag: android-x86-6.0-r1~871 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=6b345581d24ad02b63f5950a5de02ff303026a30;p=android-x86%2Fpackages-apps-Settings.git Merge "Don't reset the keystore during password change" --- 6b345581d24ad02b63f5950a5de02ff303026a30