summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2015-03-25am 56d7d4bc: am d2bdc571: Merge "Remove superfluous OpenSSL include paths."android-cts-6.0_r9android-cts-6.0_r8android-cts-6.0_r7android-cts-6.0_r6android-cts-6.0_r5android-cts-6.0_r4android-cts-6.0_r32android-cts-6.0_r31android-cts-6.0_r30android-cts-6.0_r3android-cts-6.0_r29android-cts-6.0_r28android-cts-6.0_r27android-cts-6.0_r26android-cts-6.0_r25android-cts-6.0_r24android-cts-6.0_r23android-cts-6.0_r22android-cts-6.0_r21android-cts-6.0_r20android-cts-6.0_r2android-cts-6.0_r19android-cts-6.0_r18android-cts-6.0_r17android-cts-6.0_r16android-cts-6.0_r15android-cts-6.0_r14android-cts-6.0_r13android-cts-6.0_r12android-cts-6.0_r1android-6.0.1_r9android-6.0.1_r81android-6.0.1_r80android-6.0.1_r8android-6.0.1_r79android-6.0.1_r78android-6.0.1_r77android-6.0.1_r74android-6.0.1_r73android-6.0.1_r72android-6.0.1_r70android-6.0.1_r7android-6.0.1_r69android-6.0.1_r66android-6.0.1_r65android-6.0.1_r63android-6.0.1_r61android-6.0.1_r60android-6.0.1_r59android-6.0.1_r58android-6.0.1_r57android-6.0.1_r56android-6.0.1_r55android-6.0.1_r52android-6.0.1_r51android-6.0.1_r50android-6.0.1_r5android-6.0.1_r49android-6.0.1_r48android-6.0.1_r47android-6.0.1_r46android-6.0.1_r43android-6.0.1_r42android-6.0.1_r41android-6.0.1_r40android-6.0.1_r4android-6.0.1_r33android-6.0.1_r32android-6.0.1_r31android-6.0.1_r30android-6.0.1_r3android-6.0.1_r28android-6.0.1_r27android-6.0.1_r26android-6.0.1_r20android-6.0.1_r18android-6.0.1_r17android-6.0.1_r16android-6.0.1_r13android-6.0.1_r12android-6.0.1_r11android-6.0.1_r10android-6.0.1_r1android-6.0.0_r7android-6.0.0_r6android-6.0.0_r5android-6.0.0_r41android-6.0.0_r4android-6.0.0_r3android-6.0.0_r26android-6.0.0_r25android-6.0.0_r24android-6.0.0_r23android-6.0.0_r2android-6.0.0_r13android-6.0.0_r12android-6.0.0_r11android-6.0.0_r1marshmallow-releasemarshmallow-mr3-releasemarshmallow-mr2-releasemarshmallow-mr1-releasemarshmallow-mr1-devmarshmallow-dr-releasemarshmallow-dr-dragon-releasemarshmallow-dr-devmarshmallow-devmarshmallow-cts-releaseKenny Root
2015-03-25am d2bdc571: Merge "Remove superfluous OpenSSL include paths."Kenny Root
2015-03-25Merge "Remove superfluous OpenSSL include paths."android-wear-5.1.1_r1android-wear-5.1.0_r1android-m-preview-2android-m-preview-1android-m-previewmaster-soongKenny Root
2015-02-26am fb378aec: am 26391c90: Merge "Separate keymaster0 and keymaster1 HALs."Shawn Willden
2015-02-26am 26391c90: Merge "Separate keymaster0 and keymaster1 HALs."Shawn Willden
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