Kenny Root 9eed9e962c Revert "Track change to Conscrypt" DO NOT MERGE ANYWHERE ...

This reverts commit 4ff668d47a.

Bug: 19894176
Change-Id: I3cabec555f46b535720c58db73d9116d83a239dd

2015-03-31 09:15:37 -07:00

..

AndroidKeyPairGenerator.java

Revert "Track change to Conscrypt" DO NOT MERGE ANYWHERE

2015-03-31 09:15:37 -07:00

AndroidKeyStore.java

resolved conflicts for merge of 1f6e789b to jb-mr2-dev-plus-aosp

2013-04-29 23:09:03 -07:00

AndroidKeyStoreProvider.java

Rename API AndroidKey* -> Key*

2013-04-18 18:34:58 -07:00

Credentials.java

Remove unused imports from frameworks/base.

2013-11-20 11:31:47 -05:00

IKeyChainAliasCallback.aidl

…

IKeyChainService.aidl

Add DevicePolicyManager PrivateKey mgmt

2014-09-11 19:17:00 +01:00

KeyChain.java

Revert "Track change to Conscrypt" DO NOT MERGE ANYWHERE

2015-03-31 09:15:37 -07:00

KeyChainAliasCallback.java

Remove unused imports from frameworks/base.

2013-11-20 11:31:47 -05:00

KeyChainException.java

…

KeyPairGeneratorSpec.java

Revert "Track change to Conscrypt" DO NOT MERGE ANYWHERE

2015-03-31 09:15:37 -07:00

KeyStore.java

Revert "Track change to Conscrypt" DO NOT MERGE ANYWHERE

2015-03-31 09:15:37 -07:00

KeyStoreParameter.java

am b1cb5aab: am 748856f2: am a7ddd029: am 80e84e2d: am f3cecfa2: am 55d525b2: am 716cc7dc: Add documentation for AndroidKeyStore

2014-06-11 19:33:51 +00:00

package.html

docs: fix broken links and add new sitemap text file

2013-01-03 18:02:21 -08:00

SystemKeyStore.java

Remove unused imports from frameworks/base.

2013-11-20 11:31:47 -05:00