summaryrefslogtreecommitdiffstats
path: root/keystore/java/android/security/AndroidKeyStore.java
Commit message (Expand)AuthorAgeFilesLines
* resolved conflicts for merge of 1f6e789b to jb-mr2-dev-plus-aospKenny Root2013-04-291-2/+2
|\
| * Track change to JSSE providerKenny Root2013-04-291-2/+2
| * AndroidKeyStore: Add encrypted flagKenny Root2013-04-151-7/+50
* | Rename API AndroidKey* -> Key*Kenny Root2013-04-181-4/+5
* | AndroidKeyStore: Add encrypted flagKenny Root2013-04-121-7/+50
|/
* KeyStore: add API to uid versionsKenny Root2013-03-201-20/+25
* Track libcore changes for OpenSSLKeyKenny Root2013-01-221-6/+3
* Add some NullPointerExceptions to AndroidKeyStoreKenny Root2012-08-311-2/+39
* Add ability to replace chain for PrivateKeyEntryKenny Root2012-08-221-12/+46
* Add KeyPairGenerator for Android keystoreKenny Root2012-08-221-20/+4
* Add AndroidKeyStore provider for KeyStore APIKenny Root2012-08-201-0/+463