aboutsummaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2022-01-06Merge branch android12-platform-releaseandroid12-gsiSzuWei Lin
2021-11-10Snap for 7901677 from 8368cb8b933b86e6090f465a1b4737f011f8e0e2 to sc-platform...android-platform-12.0.0_r9android-platform-12.0.0_r8android-platform-12.0.0_r7android-platform-12.0.0_r6android-platform-12.0.0_r5android-platform-12.0.0_r4android-platform-12.0.0_r31android-platform-12.0.0_r30android-platform-12.0.0_r3android-platform-12.0.0_r29android-platform-12.0.0_r28android-platform-12.0.0_r27android-platform-12.0.0_r26android-platform-12.0.0_r25android-platform-12.0.0_r24android-platform-12.0.0_r23android-platform-12.0.0_r22android-platform-12.0.0_r21android-platform-12.0.0_r20android-platform-12.0.0_r2android-platform-12.0.0_r19android-platform-12.0.0_r18android-platform-12.0.0_r17android-platform-12.0.0_r16android-platform-12.0.0_r15android-platform-12.0.0_r14android-platform-12.0.0_r13android-platform-12.0.0_r12android-platform-12.0.0_r11android-platform-12.0.0_r10android12-platform-releaseAndroid Build Coastguard Worker
2021-11-08Merge commit '403ae8fc66996f527778a05c5708ec8aace0f980' into sc-platform-mergeYimin Li
2021-08-14Snap for 7641961 from d2105642ed078fbd8c0f229bc56d392560e18f4e to sc-qpr1-rel...android-12.0.0_r28android-12.0.0_r26android-12.0.0_r16android12-qpr1-releaseAndroid Build Coastguard Worker
2021-08-13[automerger skipped] Merge stage-aosp-sc-ts-dev before making it an upstream ...android-12.0.0_r32android-12.0.0_r29android-12.0.0_r27android-12.0.0_r21android-12.0.0_r20android-12.0.0_r19android-12.0.0_r18android12-qpr1-d-s3-releaseandroid12-qpr1-d-s2-releaseandroid12-qpr1-d-s1-releaseandroid12-qpr1-d-releaseXin Li
2021-08-13Merge stage-aosp-sc-ts-dev before making it an upstreamXin Li
2021-08-12Merge ab/7633965The Android Open Source Project
2021-07-24Snap for 7579381 from 7c386bb4ef7b33b8e51c7a22911526b311e527f8 to sc-release ...Android Build Coastguard Worker
2021-07-24Snap for 7579381 from 7c386bb4ef7b33b8e51c7a22911526b311e527f8 to sc-releaseandroid-vts-12.0_r1android-security-12.0.0_r59android-security-12.0.0_r58android-security-12.0.0_r57android-security-12.0.0_r56android-security-12.0.0_r55android-security-12.0.0_r54android-security-12.0.0_r53android-security-12.0.0_r52android-security-12.0.0_r51android-security-12.0.0_r50android-security-12.0.0_r49android-security-12.0.0_r48android-security-12.0.0_r47android-security-12.0.0_r46android-security-12.0.0_r45android-security-12.0.0_r44android-security-12.0.0_r43android-security-12.0.0_r42android-security-12.0.0_r41android-security-12.0.0_r40android-security-12.0.0_r39android-security-12.0.0_r38android-security-12.0.0_r37android-security-12.0.0_r36android-security-12.0.0_r35android-security-12.0.0_r34android-platform-12.0.0_r1android-cts-12.0_r1android-12.0.0_r9android-12.0.0_r8android-12.0.0_r34android-12.0.0_r33android-12.0.0_r31android-12.0.0_r30android-12.0.0_r3android-12.0.0_r25android-12.0.0_r2android-12.0.0_r11android-12.0.0_r10android-12.0.0_r1android12-security-releaseandroid12-s5-releaseandroid12-s4-releaseandroid12-s3-releaseandroid12-s2-releaseandroid12-s1-releaseandroid12-releaseAndroid Build Coastguard Worker
2021-07-13Update development module version number to 319999900Adam Seaton
2021-07-03Snap for 7519874 from 30eded521ebed304411d1bcffa05355799339aab to sc-release ...Android Build Coastguard Worker
2021-07-03Snap for 7519874 from 30eded521ebed304411d1bcffa05355799339aab to sc-releaseAndroid Build Coastguard Worker
2021-07-02Replace ART's core-platform-api stub with module-lib stubsVictor Chang
2021-06-09Snap for 7439149 from 226bfdd77e0ee88a732833e9b69dc0f9e58c3e8f to sc-release ...android-build-team Robot
2021-06-09Snap for 7439149 from 226bfdd77e0ee88a732833e9b69dc0f9e58c3e8f to sc-releaseandroid-build-team Robot
2021-06-08Include sdk versioning proto in conscrypt apexAnton Hansson
2021-06-07Merge "Set dist_group: "android" for external/conscrypt java_sdk_libraries" i...TreeHugger Robot
2021-06-05Snap for 7430067 from dea8f0ba765065e11f44f74d7c26e55c15ed9724 to sc-release ...android-build-team Robot
2021-06-05Snap for 7430067 from dea8f0ba765065e11f44f74d7c26e55c15ed9724 to sc-releaseandroid-build-team Robot
2021-06-04Dist conscrypt's CorePlatformApi stubsAnton Hansson
2021-06-03Set dist_group: "android" for external/conscrypt java_sdk_librariesColin Cross
2021-05-27Snap for 7402811 from 1fda0f9a95d8354b368156cd59913438fd3996b4 to sc-release ...android-build-team Robot
2021-05-27Snap for 7402811 from 1fda0f9a95d8354b368156cd59913438fd3996b4 to sc-releaseandroid-build-team Robot
2021-05-25Enable hidden API processing for com.android.conscrypt-bootclasspath-fragmentPaul Duffin
2021-05-25Snap for 7394644 from 41f0e2d6c09927de507b4e27785d5411ea3c2c2e to sc-release ...android-build-team Robot
2021-05-25Snap for 7394644 from 41f0e2d6c09927de507b4e27785d5411ea3c2c2e to sc-releaseandroid-build-team Robot
2021-05-23Replace @link with @code for public alternativesPaul Duffin
2021-05-21Snap for 7384269 from 12fb67f4f5fae9339814b04cb742ff92ecdeed4d to sc-release ...android-build-team Robot
2021-05-21Snap for 7384269 from 12fb67f4f5fae9339814b04cb742ff92ecdeed4d to sc-releaseandroid-build-team Robot
2021-05-20Merge "Make libconscrypt_openjdk_jni visible to vendor" into sc-devKwang-un Jin
2021-05-15Snap for 7364021 from e2354018cdd6da63b7dac020be638cba646eb639 to sc-release ...android-build-team Robot
2021-05-15Snap for 7364021 from e2354018cdd6da63b7dac020be638cba646eb639 to sc-releaseandroid-build-team Robot
2021-05-14Add bootclasspath_fragment. am: 1081254f5e am: 21fa559e27 am: 58b3fac5aesatayev
2021-05-14Add bootclasspath_fragment. am: 1081254f5e am: 21fa559e27satayev
2021-05-14Make libconscrypt_openjdk_jni visible to vendorKwang-un Jin
2021-05-12Add bootclasspath_fragment. am: 1081254f5esatayev
2021-05-12Add bootclasspath_fragment.android-s-beta-2android-s-beta-1satayev
2021-05-08Snap for 7347062 from c3f0727f3609d1033c96fb5c7131b5f6c0b9723c to sc-release ...android-build-team Robot
2021-05-08Snap for 7347062 from c3f0727f3609d1033c96fb5c7131b5f6c0b9723c to sc-releaseandroid-build-team Robot
2021-05-07Merge Conscrypt upstream master. am: b51c989d56 am: 20c8844f41 am: 0ba742fea8Pete Bentley
2021-05-07Merge Conscrypt upstream master. am: b51c989d56 am: 20c8844f41Pete Bentley
2021-05-07Merge Conscrypt upstream master. am: b51c989d56Pete Bentley
2021-05-07Merge Conscrypt upstream master.Pete Bentley
2021-05-07Remove unnecessary const_cast. (#1008)David Benjamin
2021-05-07Use i2d_X509_CRL_tbs to encode the TBSCertList. (#1007)David Benjamin
2021-05-05Snap for 7336869 from 7434ca0903251792c9fc84b009d4f4f2af663976 to sc-release ...android-build-team Robot
2021-05-05Snap for 7336869 from 7434ca0903251792c9fc84b009d4f4f2af663976 to sc-releaseandroid-build-team Robot
2021-05-04Merge "Make conscrypt test apex visible in vendor directory" into sc-devKun Niu
2021-05-01Snap for 7328689 from 09c1fa40d150c5a3d70f1bfcab0cce1ca5fea34e to sc-release ...android-build-team Robot
2021-05-01Snap for 7328689 from 09c1fa40d150c5a3d70f1bfcab0cce1ca5fea34e to sc-releaseandroid-build-team Robot