Elliott Hughes a920f25fe5 resolved conflicts for merge of fca0f92e to stage-aosp-master ...

Change-Id: I4791f0ffa324a313b8390fbde6d8f82f716ecf74

2013-06-28 16:41:19 -07:00

..

AndroidKeyPairGenerator.java

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

2013-04-29 23:09:03 -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

Switch frameworks/base over from @hidden Charsets to public StandardCharsets.

2013-06-28 16:24:48 -07:00

IKeyChainAliasCallback.aidl

…

IKeyChainService.aidl

…

KeyChain.java

am cd1de394: Merge "Track change in NativeCrypto"

2013-05-06 15:13:58 -07:00

KeyChainAliasCallback.java

…

KeyChainException.java

…

KeyPairGeneratorSpec.java

Rename API AndroidKey* -> Key*

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

KeyStore.java

AndroidKeyStore: Add encrypted flag

2013-04-15 19:33:15 +00:00

KeyStoreParameter.java

Rename API AndroidKey* -> Key*

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

package.html

docs: fix broken links and add new sitemap text file

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

SystemKeyStore.java

…