summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2016-04-26merge in nyc-release history after reset to nyc-devandroid-cts-7.0_r9android-cts-7.0_r8android-cts-7.0_r7android-cts-7.0_r6android-cts-7.0_r5android-cts-7.0_r4android-cts-7.0_r33android-cts-7.0_r32android-cts-7.0_r31android-cts-7.0_r30android-cts-7.0_r3android-cts-7.0_r29android-cts-7.0_r28android-cts-7.0_r27android-cts-7.0_r26android-cts-7.0_r25android-cts-7.0_r24android-cts-7.0_r23android-cts-7.0_r22android-cts-7.0_r21android-cts-7.0_r20android-cts-7.0_r2android-cts-7.0_r19android-cts-7.0_r18android-cts-7.0_r17android-cts-7.0_r16android-cts-7.0_r15android-cts-7.0_r14android-cts-7.0_r13android-cts-7.0_r12android-cts-7.0_r11android-cts-7.0_r10android-cts-7.0_r1android-7.0.0_r9android-7.0.0_r8android-7.0.0_r7android-7.0.0_r6android-7.0.0_r5android-7.0.0_r4android-7.0.0_r35android-7.0.0_r34android-7.0.0_r33android-7.0.0_r32android-7.0.0_r31android-7.0.0_r30android-7.0.0_r3android-7.0.0_r29android-7.0.0_r28android-7.0.0_r27android-7.0.0_r24android-7.0.0_r21android-7.0.0_r19android-7.0.0_r17android-7.0.0_r15android-7.0.0_r14android-7.0.0_r13android-7.0.0_r12android-7.0.0_r11android-7.0.0_r10android-7.0.0_r1nougat-releasenougat-cts-releasenougat-bugfix-releaseThe Android Automerger
2016-04-15Move keystore to foreground cpuset.nougat-devMartijn Coenen
2016-03-31merge in nyc-release history after reset to nyc-devThe Android Automerger
2016-03-29Implement key upgrade in keystore.Shawn Willden
2016-03-29Configure keymaster with OS version info.Shawn Willden
2016-03-27merge in nyc-release history after reset to nyc-devThe Android Automerger
2016-03-25Fix AuthTokenTable tests.Shawn Willden
2016-02-11merge in nyc-release history after reset to nyc-devThe Android Automerger
2016-02-08Actually pass attestation requests through to keystore.Shawn Willden
2016-02-07merge in nyc-release history after reset to masterThe Android Automerger
2016-02-02Fix various memory errors.Shawn Willden
2016-02-02merge in nyc-release history after reset to masterThe Android Automerger
2016-02-02merge in nyc-release history after reset to masterThe Android Automerger
2016-01-28Merge changes from topic \'km_tag_allow_on_body\' am: a1433ee2f8Shawn Willden
2016-01-28Merge changes from topic \'km_tag_allow_on_body\'Shawn Willden
2016-01-28Merge changes from topic 'km_tag_allow_on_body'brillo-m10-releasebrillo-m10-devShawn Willden
2016-01-27Add KM_TAG_ALLOW_WHILE_ON_BODYShawn Willden
2016-01-27Add attestation support to keystore.Shawn Willden
2016-01-27Merge "Update Keystore to use keymaster2 HAL." am: fd50293cd5Shawn Willden
2016-01-27Merge "Update Keystore to use keymaster2 HAL."Shawn Willden
2016-01-27Merge "Update Keystore to use keymaster2 HAL."Shawn Willden
2016-01-26Refactor keystore.Shawn Willden
2016-01-26Merge "Refactor keystore." am: e4f2fa54b0Shawn Willden
2016-01-26Merge "Refactor keystore."Shawn Willden
2016-01-26Merge "Refactor keystore."Shawn Willden
2016-01-26Update Keystore to use keymaster2 HAL.Shawn Willden
2016-01-26Refactor keystore.Shawn Willden
2016-01-26keep history after reset to mnc-dr-dev am: d1b3dc5f63 -s oursBaligh Uddin
2016-01-26keep history after reset to mnc-dr-devBaligh Uddin
2016-01-25keep history after reset to mnc-dr-devandroid-6.0.1_r68android-6.0.1_r67android-6.0.1_r62android-6.0.1_r54android-6.0.1_r53android-6.0.1_r45android-6.0.1_r25android-6.0.1_r24android-6.0.1_r22android-6.0.1_r21marshmallow-dr1.6-releasemarshmallow-dr1.5-releaseBaligh Uddin
2016-01-25Merge "Update keystore_cli_v2 for keymaster_defs changes." am: 93c57ca1b2Shawn Willden
2016-01-25Merge "Update keystore_cli_v2 for keymaster_defs changes."Shawn Willden
2016-01-25Merge "Update keystore_cli_v2 for keymaster_defs changes."Shawn Willden
2016-01-20Update keystore_cli_v2 for keymaster_defs changes.Shawn Willden
2015-12-23Merge "Limit maximum number of concurrent keystore operations." am: 108a5d34b...Shawn Willden
2015-12-23Merge "ECIES: adding ECIES-KEM" am: ab42146068 am: e5f3a444f6Shawn Willden
2015-11-26Merge "Limit maximum number of concurrent keystore operations." am: 108a5d34b...Shawn Willden
2015-11-23Merge "Limit maximum number of concurrent keystore operations." am: 108a5d34b5Shawn Willden
2015-11-23Merge "Limit maximum number of concurrent keystore operations." am: 108a5d34b5Shawn Willden
2015-11-23Merge "Limit maximum number of concurrent keystore operations."brillo-m9-releasebrillo-m9-devbrillo-m8-releasebrillo-m8-devShawn Willden
2015-11-23Merge "Limit maximum number of concurrent keystore operations."Shawn Willden
2015-11-23Merge "ECIES: adding ECIES-KEM" am: ab42146068 am: e5f3a444f6Shawn Willden
2015-11-23Merge "ECIES: adding ECIES-KEM" am: ab42146068Shawn Willden
2015-11-23Merge "ECIES: adding ECIES-KEM" am: ab42146068Shawn Willden
2015-11-23Merge "ECIES: adding ECIES-KEM"Shawn Willden
2015-11-23Merge "ECIES: adding ECIES-KEM"Shawn Willden
2015-11-23Limit maximum number of concurrent keystore operations.Shawn Willden
2015-11-23ECIES: adding ECIES-KEMShawn Willden
2015-11-10Merge "keystore: Add a test suitable for Brillo PTS." am: 296727f895 am: 6c4a...Darren Krahn
2015-11-10Merge "keystore: Add a test suitable for Brillo PTS." am: 296727f895Darren Krahn
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-17 00:12:52 +0000