Trevor Johns 682c24e228 Resolve merge conflicts of a5060ee to nyc-dev ...

This undoes the automerger skip which occured in
commit e740c84dc3 and
replays it as a standard (NOT -s ours) merge.

Change-Id: If5a47be26f73d6a0735c425cd66310a3e2a89086

2016-04-19 02:03:59 -07:00

..

keystore

Resolve merge conflicts of a5060ee to nyc-dev

2016-04-19 02:03:59 -07:00

Credentials.java

More sensible return code for Credentials.deleteAll

2016-03-01 18:56:14 +00:00

GateKeeper.java

Move Android Keystore impl to android.security.keystore.

2015-05-13 16:17:40 -07:00

IKeyChainAliasCallback.aidl

…

IKeyChainService.aidl

Add DevicePolicyManager API to install a client cert chain.

2016-03-30 11:57:58 +01:00

KeyChain.java

Add DevicePolicyManager API to install a client cert chain.

2016-03-30 11:57:58 +01:00

KeyChainAliasCallback.java

Add NonNull and Nullable annotations to AndroidKeyStore API.

2015-05-11 12:30:03 -07:00

KeyChainException.java

…

KeyPairGeneratorSpec.java

Android Keystore keys are no longer backed by Conscrypt.

2015-06-10 14:50:55 -07:00

KeyStore.java

More sensible return code for Credentials.deleteAll

2016-03-01 18:56:14 +00:00

KeyStoreException.java

Rename KeymasterException to KeyStoreException.

2015-04-02 15:57:27 -07:00

KeyStoreParameter.java

Remove KeyStoreParameter.getContext().

2015-05-26 10:44:53 -07:00

package.html

…

SystemKeyStore.java

…