aboutsummaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2022-06-11Snap for 8712302 from 57b81b0327cb9dead2a36357d4937e3accb4376f to tm-frc-sche...t_frc_sch_330443040t_frc_sch_330443010android13-frc-scheduling-releaseAndroid Build Coastguard Worker
2022-05-26Bump version codes in tm-dev to match tm-mainline-prodandroid13-devsatayev
2022-05-16Snap for 8598433 from 66556c845f16debece27764ff6ac026345062b65 to tm-frc-sche...Android Build Coastguard Worker
2022-05-13Skip XDH key agreement test for Android KeystoreEran Messeri
2022-05-12Snap for 8580258 from 31d4fdb74fe7bc72cd94401711b3eb65f3999aca to tm-frc-sche...Android Build Coastguard Worker
2022-05-11Bump Mainline Module Version Codes in tm-dev to 330090000Alexei Nicoara
2022-04-28Snap for 8512216 from 961ed1d210604202e105563e18838aebce8404fd to tm-frc-sche...Android Build Coastguard Worker
2022-04-20Merge "Bump apex version to 33xxxxxx in tm-dev." into tm-devArtur Satayev
2022-04-20Merge "Revert "Merge Conscrypt Upstream master."" am: 3040e1e4cf am: ccaca2fe...Treehugger Robot
2022-04-19Merge "Revert "Merge Conscrypt Upstream master."" am: 3040e1e4cf am: ccaca2fe3aTreehugger Robot
2022-04-19Merge "Revert "Merge Conscrypt Upstream master."" am: 3040e1e4cfTreehugger Robot
2022-04-19Merge "Revert "Merge Conscrypt Upstream master.""Treehugger Robot
2022-04-19Bump apex version to 33xxxxxx in tm-dev.satayev
2022-04-13Revert "Merge Conscrypt Upstream master."Pete Bentley
2022-04-08Run libcore.java.security tests in Conscrypt presubmit. am: dc1ef2021e am: 0f...Pete Bentley
2022-04-08Run libcore.java.security tests in Conscrypt presubmit. am: dc1ef2021e am: 0f...Pete Bentley
2022-04-08Run libcore.java.security tests in Conscrypt presubmit. am: dc1ef2021ePete Bentley
2022-04-08Run libcore.java.security tests in Conscrypt presubmit.Pete Bentley
2022-04-07[automerger skipped] Revert "[DO NOT MERGE] Fix Conscrypt CTS for sc-v2-dev."...Pete Bentley
2022-04-07[automerger skipped] Revert "[DO NOT MERGE] Fix Conscrypt CTS for sc-v2-dev."...Pete Bentley
2022-04-07Revert "[DO NOT MERGE] Fix Conscrypt CTS for sc-v2-dev."Pete Bentley
2022-04-07Merge "Merge Conscrypt Upstream master." am: 3ca2f15041 am: d9868a5dd9 am: 02...Treehugger Robot
2022-04-07Merge "Merge Conscrypt Upstream master." am: 3ca2f15041 am: d9868a5dd9Treehugger Robot
2022-04-07Merge "Merge Conscrypt Upstream master." am: 3ca2f15041Treehugger Robot
2022-04-07[automerger skipped] Merge "Revert "[DO NOT MERGE] Fix Conscrypt CTS for sc-v...Pete Bentley
2022-04-07[automerger skipped] Revert "[DO NOT MERGE] Fix Conscrypt CTS for sc-v2-dev."...Pete Bentley
2022-04-07Merge "Merge Conscrypt Upstream master."Treehugger Robot
2022-04-07Merge "Revert "[DO NOT MERGE] Fix Conscrypt CTS for sc-v2-dev."" into sc-v2-d...Pete Bentley
2022-04-06Revert "[DO NOT MERGE] Fix Conscrypt CTS for sc-v2-dev."Pete Bentley
2022-04-06Merge Conscrypt Upstream master.Pete Bentley
2022-04-05Additional checks before calling GetDirectBuffer{Address,Capacity} am: 825075...Orion Hodson
2022-04-05Additional checks before calling GetDirectBuffer{Address,Capacity} am: 825075...Orion Hodson
2022-04-05Additional checks before calling GetDirectBuffer{Address,Capacity} am: 825075...Orion Hodson
2022-04-05Additional checks before calling GetDirectBuffer{Address,Capacity}Orion Hodson
2022-04-04Don't include JNI tracing functionality unless required. (#1042)Pete Bentley
2022-04-01[automerger skipped] [DO NOT MERGE] Revert "Fix Conscrypt CTS for sc-v2-dev."...Pete Bentley
2022-04-01[automerger skipped] [DO NOT MERGE] Revert "Fix Conscrypt CTS for sc-v2-dev."...Pete Bentley
2022-04-01[automerger skipped] [DO NOT MERGE] Revert "Fix Conscrypt CTS for sc-v2-dev."...Pete Bentley
2022-04-01[DO NOT MERGE] Revert "Fix Conscrypt CTS for sc-v2-dev."Pete Bentley
2022-03-24Update junit dependency to 4.13.2. (#1059)Pete Bentley
2022-03-21Remove implementation details from conscrypt hidden api flags am: e7be1cd6a0 ...Paul Duffin
2022-03-21Remove implementation details from conscrypt hidden api flags am: e7be1cd6a0 ...Paul Duffin
2022-03-21Remove implementation details from conscrypt hidden api flags am: e7be1cd6a0Paul Duffin
2022-03-21Use assertThrows() in OptionalMethodTest (#1058)Kurt Alfred Kluever
2022-03-21Use assertThrows() in SSLContextTest (#1057)Kurt Alfred Kluever
2022-03-21Fix macOS CI (#1056)Maaz Amin
2022-03-21Remove implementation details from conscrypt hidden api flagsPaul Duffin
2022-03-10Minor Scrypt tidy-ups. (#1055)Pete Bentley
2022-03-09Add scrypt support. (#1054)Adam Langley
2022-03-09Fix R8 compiler warnings (#1046)Søren Gjesse