summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2013-04-23Revert of DERT61String change from 44021512997b337e6079e46fd4230ce979c20b6fandroid-4.3_r3.1android-4.3_r3android-4.3_r2.3android-4.3_r2.2android-4.3_r2.1android-4.3_r2android-4.3_r1.1android-4.3_r1android-4.3_r0.9.1android-4.3_r0.9android-4.3.1_r1jb-mr2.0.0-releasejb-mr2.0-releasejb-mr2-releasejb-mr2-devBrian Carlstrom
2013-03-19resolved conflicts for merge of aebc7ff8 to jb-mr2-devKenny Root
2013-03-19am 3b69cbe7: Merge "Make ECDH KeyAgreement reject AlgorithmParameterSpec."Kenny Root
2013-03-19Merge "Make ECDH KeyAgreement reject AlgorithmParameterSpec."Kenny Root
2013-03-19Make ECDH KeyAgreement reject AlgorithmParameterSpec.Alex Klyubin
2013-03-11am c7b3ba5e: am a5e1ef4e: am 9576bbd3: (-s ours) am 810a7295: (-s ours) Recon...Jean-Baptiste Queru
2013-03-11am a5e1ef4e: am 9576bbd3: (-s ours) am 810a7295: (-s ours) Reconcile with jb-...Jean-Baptiste Queru
2013-03-11am 9576bbd3: (-s ours) am 810a7295: (-s ours) Reconcile with jb-mr1-release -...jb-mr1.1-devJean-Baptiste Queru
2013-03-11am 810a7295: (-s ours) Reconcile with jb-mr1-release - do not mergeJean-Baptiste Queru
2013-03-11Reconcile with jb-mr1-release - do not mergejb-mr1-devJean-Baptiste Queru
2013-03-05am 43be13a7: Merge "Tracking libcore change to use longs instead of ints to s...Brian Carlstrom
2013-03-04Merge "Tracking libcore change to use longs instead of ints to store pointers...Brian Carlstrom
2013-02-27Tracking libcore change to use longs instead of ints to store pointers in Ope...Brian Carlstrom
2013-02-26am dd20fc48: Merge "Fix CertPath APIs"Kenny Root
2013-02-26Merge "Fix CertPath APIs"Kenny Root
2013-02-20Fix CertPath APIsKenny Root
2013-02-12am 0caeb7ed: (-s ours) Merge "bouncycastle 1.48 upgrade"Brian Carlstrom
2013-02-12bouncycastle 1.48 upgradeBrian Carlstrom
2013-02-12Merge "bouncycastle 1.48 upgrade"Brian Carlstrom
2013-02-12bouncycastle 1.48 upgradeBrian Carlstrom
2013-02-04am 2d8d9ce0: resolved conflicts for merge of e0c8f221 to jb-mr1-dev-plus-aospBrian Carlstrom
2013-02-01resolved conflicts for merge of e0c8f221 to jb-mr1-dev-plus-aospBrian Carlstrom
2013-02-01am c4c8087c: Add certs to blacklist.android-cts-4.2_r2android-4.2.2_r1.2android-4.2.2_r1.1android-4.2.2_r1jb-mr1.1-releaseGeremy Condra
2013-01-29am b8bddcfe: Merge "Restore PBE Cipher wrap and unwrap support from upstream"Brian Carlstrom
2013-01-30Merge "Restore PBE Cipher wrap and unwrap support from upstream"jb-mr1-dev-plus-aospBrian Carlstrom
2013-01-29Restore PBE Cipher wrap and unwrap support from upstreamBrian Carlstrom
2013-01-22Add certs to blacklist.Geremy Condra
2013-01-18am 6c392aa7: Merge "Add getIssuerAlternativeNames() to JCE API"Kenny Root
2013-01-18Merge "Add getIssuerAlternativeNames() to JCE API"Kenny Root
2013-01-17resolved conflicts for merge of f1d78c98 to masterKenny Root
2013-01-16Add getIssuerAlternativeNames() to JCE APIKenny Root
2013-01-17Merge "Fix patch generation timestamps"Kenny Root
2013-01-16Fix patch generation timestampsKenny Root
2013-01-15Add certs to blacklist.Geremy Condra
2013-01-09resolved conflicts for merge of 73f666df to masterKenny Root
2013-01-07Merge "Add getSubjectAlternativeNames() to certificate JCE"Kenny Root
2013-01-07Add getSubjectAlternativeNames() to certificate JCEKenny Root
2012-12-05am b61009d9: Merge "Simplify makefile."Elliott Hughes
2012-12-04Merge "Simplify makefile."Elliott Hughes
2012-12-04Simplify makefile.Elliott Hughes
2012-11-06am f81fa0e5: (-s ours) am 1508faa5: Reconcile with jb-mr1-factory-release jb-...The Android Open Source Project
2012-11-06am 1508faa5: Reconcile with jb-mr1-factory-release jb-mr1-release - do not mergeThe Android Open Source Project
2012-11-06Reconcile with jb-mr1-factory-release jb-mr1-release - do not mergeThe Android Open Source Project
2012-11-02am b24e661c: (-s ours) Reconcile with jb-mr1-release - do not mergeThe Android Open Source Project
2012-11-02Reconcile with jb-mr1-release - do not mergeThe Android Open Source Project
2012-11-01merge in jb-mr1-release history after reset to jb-mr1-devandroid-cts-4.2_r1android-4.2_r1android-4.2.1_r1.2android-4.2.1_r1.1android-4.2.1_r1jb-mr1-releaseThe Android Automerger
2012-11-01resolved conflicts for merge of 52112f9f to masterBrian Carlstrom
2012-11-01am 036093e8: Fix registration of MD5withRSA SignaturesBrian Carlstrom
2012-11-01Fix registration of MD5withRSA Signaturesandroid-sdk-support_r11Brian Carlstrom
2012-10-12resolved conflicts for merge of 9912a9c8 to masterKenny Root
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-16 00:42:02 +0000