Merge "Adding KEY_PERMANENTLY_INVALIDATED int"

author Max Bires <jbires@google.com>

Fri, 8 Mar 2019 17:53:05 +0000 (17:53 +0000)

committer Gerrit Code Review <noreply-gerritcodereview@google.com>

Fri, 8 Mar 2019 17:53:05 +0000 (17:53 +0000)
author Max Bires <jbires@google.com>
Fri, 8 Mar 2019 17:53:05 +0000 (17:53 +0000)
committer Gerrit Code Review <noreply-gerritcodereview@google.com>
Fri, 8 Mar 2019 17:53:05 +0000 (17:53 +0000)
diff --cc keystore/java/android/security/KeyStore.java
Simple merge
diff --cc keystore/java/android/security/keystore/AndroidKeyStoreKeyPairGeneratorSpi.java
Simple merge
author	Max Bires <jbires@google.com>
	Fri, 8 Mar 2019 17:53:05 +0000 (17:53 +0000)
committer	Gerrit Code Review <noreply-gerritcodereview@google.com>
	Fri, 8 Mar 2019 17:53:05 +0000 (17:53 +0000)
		1	2
keystore/java/android/security/KeyStore.java	patch \|	diff1 \|	diff2 \|	blob \| history
keystore/java/android/security/keystore/AndroidKeyStoreKeyPairGeneratorSpi.java	patch \|	diff1 \|	diff2 \|	blob \| history