summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2015-02-26Merge "Separate keymaster0 and keymaster1 HALs."Shawn Willden
2015-02-26am b00de244: Separate keymaster0 and keymaster1 HALs.Shawn Willden
2015-02-25Separate keymaster0 and keymaster1 HALs.Shawn Willden
2015-02-25Separate keymaster0 and keymaster1 HALs.Shawn Willden
2015-02-24Separate keymaster0 and keymaster1 HALs.Shawn Willden
2015-01-22Remove superfluous OpenSSL include paths.Adam Langley
2014-06-06am 2d8aa1e3: merge in master-release history after reset to f4191b59196237680...android-wear-5.0.0_r1android-cts-5.1_r9android-cts-5.1_r8android-cts-5.1_r7android-cts-5.1_r6android-cts-5.1_r5android-cts-5.1_r4android-cts-5.1_r3android-cts-5.1_r28android-cts-5.1_r27android-cts-5.1_r26android-cts-5.1_r25android-cts-5.1_r24android-cts-5.1_r23android-cts-5.1_r22android-cts-5.1_r21android-cts-5.1_r20android-cts-5.1_r2android-cts-5.1_r19android-cts-5.1_r18android-cts-5.1_r17android-cts-5.1_r16android-cts-5.1_r15android-cts-5.1_r14android-cts-5.1_r13android-cts-5.1_r10android-cts-5.1_r1android-cts-5.0_r9android-cts-5.0_r8android-cts-5.0_r7android-cts-5.0_r6android-cts-5.0_r5android-cts-5.0_r4android-cts-5.0_r3android-5.1.1_r9android-5.1.1_r8android-5.1.1_r7android-5.1.1_r6android-5.1.1_r5android-5.1.1_r4android-5.1.1_r38android-5.1.1_r37android-5.1.1_r36android-5.1.1_r35android-5.1.1_r34android-5.1.1_r33android-5.1.1_r30android-5.1.1_r3android-5.1.1_r29android-5.1.1_r28android-5.1.1_r26android-5.1.1_r25android-5.1.1_r24android-5.1.1_r23android-5.1.1_r22android-5.1.1_r20android-5.1.1_r2android-5.1.1_r19android-5.1.1_r18android-5.1.1_r17android-5.1.1_r16android-5.1.1_r15android-5.1.1_r14android-5.1.1_r13android-5.1.1_r12android-5.1.1_r10android-5.1.1_r1android-5.1.0_r5android-5.1.0_r4android-5.1.0_r3android-5.1.0_r1android-5.0.2_r3android-5.0.2_r1android-5.0.1_r1android-5.0.0_r7android-5.0.0_r6android-5.0.0_r5.1android-5.0.0_r5android-5.0.0_r4android-5.0.0_r3android-5.0.0_r2android-5.0.0_r1lollipop-wear-releaselollipop-releaselollipop-mr1-wfc-releaselollipop-mr1-releaselollipop-mr1-fi-releaselollipop-mr1-devlollipop-mr1-cts-releaselollipop-devlollipop-cts-releaseThe Android Automerger
2014-06-04keymaster: fix QSEEComAPI lookup pathMekala Natarajan
2014-06-03keymaster: Build keymaster for msm8084Naveen Ramaraj
2014-05-22merge in master-release history after reset to f4191b59196237680f3ebc8fc2af62...The Android Automerger
2014-05-22merge in master-release history after reset to f4191b59196237680f3ebc8fc2af62...The Android Automerger
2014-05-21merge in master-release history after reset to f4191b59196237680f3ebc8fc2af62...The Android Automerger
2014-05-20merge in master-release history after reset to f4191b59196237680f3ebc8fc2af62...The Android Automerger
2014-05-19merge in master-release history after reset to f4191b59196237680f3ebc8fc2af62...The Android Automerger
2014-05-18merge in master-release history after reset to f4191b59196237680f3ebc8fc2af62...The Android Automerger
2014-05-17merge in master-release history after reset to f4191b59196237680f3ebc8fc2af62...The Android Automerger
2014-05-15merge in master-release history after reset to f4191b59196237680f3ebc8fc2af62...The Android Automerger
2014-05-14merge in master-release history after reset to f4191b59196237680f3ebc8fc2af62...The Android Automerger
2014-05-13merge in master-release history after reset to f4191b59196237680f3ebc8fc2af62...The Android Automerger
2014-05-12merge in master-release history after reset to f4191b59196237680f3ebc8fc2af62...The Android Automerger
2014-05-11merge in master-release history after reset to f4191b59196237680f3ebc8fc2af62...The Android Automerger
2014-05-10merge in master-release history after reset to f4191b59196237680f3ebc8fc2af62...The Android Automerger
2014-05-08merge in master-release history after reset to f4191b59196237680f3ebc8fc2af62...The Android Automerger
2014-05-07Set correct module version for qcom keystorePaul Lawrence
2014-05-06Set correct module version for qcom keystorePaul Lawrence
2014-04-17Add flag indicating that this impl doesn't require /data.Geremy Condra
2014-01-14am 70d36107: am 711560b6: Merge "Log message spelling correction."Kenny Root
2014-01-14am 711560b6: Merge "Log message spelling correction."android-l-preview_r2l-previewKenny Root
2014-01-14Merge "Log message spelling correction."idea133-weekly-releaseKenny Root
2014-01-13Log message spelling correction.Ian Rogers
2013-12-06am 162723c0: am 060bd97e: Merge commit \'eab8a2ac417ba93bdfb09ddcb6095580a0ce...The Android Open Source Project
2013-12-05am 060bd97e: Merge commit \'eab8a2ac417ba93bdfb09ddcb6095580a0cef0c4\' into HEADThe Android Open Source Project
2013-12-05Merge commit 'eab8a2ac417ba93bdfb09ddcb6095580a0cef0c4' into HEADidea133The Android Open Source Project
2013-11-22am 350fbb78: am 099a9d06: Merge commit \'7d563651aa956c0f9831b7b64be35c2ec790...The Android Open Source Project
2013-11-22am 099a9d06: Merge commit \'7d563651aa956c0f9831b7b64be35c2ec790bdec\' into HEADThe Android Open Source Project
2013-11-22Merge commit '7d563651aa956c0f9831b7b64be35c2ec790bdec' into HEADThe Android Open Source Project
2013-11-07Merge "keymaster: rename ion_allocation_data.heap_mask to heap_id_mask"Rom Lemarchand
2013-11-06am eab8a2ac: am f740c98b: Merge "do not use GNU old-style field designators"Nick Kralevich
2013-11-06am f740c98b: Merge "do not use GNU old-style field designators"Nick Kralevich
2013-11-07Merge "do not use GNU old-style field designators"Nick Kralevich
2013-11-06do not use GNU old-style field designatorssynergy dev
2013-10-23keymaster: rename ion_allocation_data.heap_mask to heap_id_maskRom Lemarchand
2013-09-18am 7d563651: am e35dafa8: Merge "Use canonical UniquePtr.h header"Kenny Root
2013-09-18am e35dafa8: Merge "Use canonical UniquePtr.h header"Kenny Root
2013-09-11Use canonical UniquePtr.h headerKenny Root
2013-09-11Merge "Use canonical UniquePtr.h header"Kenny Root
2013-09-11Use canonical UniquePtr.h headerKenny Root
2013-08-20keymaster: Enable compilation for msm8226 based platformsandroid-sdk-4.4.2_r1.0.1android-sdk-4.4.2_r1android-cts-4.4_r4android-cts-4.4_r1android-4.4w_r1android-4.4_r1.2.0.1android-4.4_r1.2android-4.4_r1.1.0.1android-4.4_r1.1android-4.4_r1.0.1android-4.4_r1android-4.4_r0.9android-4.4_r0.8android-4.4_r0.7android-4.4.4_r2.0.1android-4.4.4_r2android-4.4.4_r1.0.1android-4.4.4_r1android-4.4.3_r1.1.0.1android-4.4.3_r1.1android-4.4.3_r1.0.1android-4.4.3_r1android-4.4.2_r2.0.1android-4.4.2_r2android-4.4.2_r1.0.1android-4.4.2_r1android-4.4.1_r1.0.1android-4.4.1_r1kitkat-wearkitkat-releasekitkat-mr2.2-releasekitkat-mr2.1-releasekitkat-mr2-releasekitkat-mr1.1-releasekitkat-mr1-releasekitkat-devkitkat-cts-releasekitkat-cts-devAjay Dudani
2013-06-13keymaster: Add support for enabling CE clksAjay Dudani
2013-05-24keymaster: Add msm8974 archtecture and use TARGET_BOARD_PLATFORMSungmin Choi