summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2012-08-20am 878c359d: Merge "Add getmtime command for keys"android-sdk-support_r11android-cts-4.2_r2android-cts-4.2_r1android-4.2_r1android-4.2.2_r1.2android-4.2.2_r1.1android-4.2.2_r1android-4.2.1_r1.2android-4.2.1_r1.1android-4.2.1_r1jb-mr1.1-releasejb-mr1.1-devjb-mr1-releasejb-mr1-devKenny Root
2012-08-20Merge "Add getmtime command for keys"Kenny Root
2012-08-20Add getmtime command for keysKenny Root
2012-08-15am e7f9da44: Merge "Clear out ENGINE flags when initializing"Kenny Root
2012-08-15Merge "Clear out ENGINE flags when initializing"Kenny Root
2012-08-15Clear out ENGINE flags when initializingKenny Root
2012-08-14am 593786c9: Merge "keymaster HAL users don\'t need delete_keypair"Kenny Root
2012-08-14Merge "keymaster HAL users don't need delete_keypair"Kenny Root
2012-08-14keymaster HAL users don't need delete_keypairKenny Root
2012-07-27Reconcile with jb-releaseThe Android Open Source Project
2012-07-24merge in jb-release history after reset to jb-devandroid-4.1.1_r6.1android-4.1.1_r6android-4.1.1_r5jb-releaseThe Android Automerger
2012-07-19am aa8467e5: Merge "Handle keynames with special characters such as - and ."Brian Carlstrom
2012-07-18Merge "Handle keynames with special characters such as - and ."Brian Carlstrom
2012-07-18Handle keynames with special characters such as - and .Brian Carlstrom
2012-07-17Handle keynames with special characters such as - and .android-cts-4.1_r4android-cts-4.1_r2android-4.1.2_r2.1android-4.1.2_r2android-4.1.2_r1jb-mr0-releasejb-devBrian Carlstrom
2012-05-17Make sure delete_all function pointer is NULLandroid-cts-4.1_r1android-4.1.1_r4android-4.1.1_r3android-4.1.1_r2android-4.1.1_r1.1android-4.1.1_r1Kenny Root
2012-05-03Only initialize ex_data if not alreadyKenny Root
2012-04-11Allow calls from secondary user Settings app.Amith Yamasani
2012-04-10Turn on extra compiler checksKenny Root
2012-03-28use UniquePtr.h from frameworks/nativeColin Cross
2012-03-27Add support for upgrading key typesKenny Root
2012-03-26Add keymaster delete_all call on resetKenny Root
2012-03-21Add keymaster to keystore with soft implementationKenny Root
2012-03-13keystore_client shared libraryKenny Root
2012-02-15Move keystore from frameworks/baseKenny Root
2012-02-15(no commit message)Anatol Pomazau