aboutsummaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2021-12-14Snap for 7995257 from d53d08067882b9da11228febf4f04c4d1950e22e to sc-v2-relea...android12L-gsiAndroid Build Coastguard Worker
2021-12-14Snap for 7995257 from d53d08067882b9da11228febf4f04c4d1950e22e to sc-v2-releaseandroid-vts-12.1_r1android-platform-12.1.0_r9android-platform-12.1.0_r8android-platform-12.1.0_r7android-platform-12.1.0_r6android-platform-12.1.0_r5android-platform-12.1.0_r4android-platform-12.1.0_r3android-platform-12.1.0_r27android-platform-12.1.0_r26android-platform-12.1.0_r25android-platform-12.1.0_r24android-platform-12.1.0_r23android-platform-12.1.0_r22android-platform-12.1.0_r21android-platform-12.1.0_r20android-platform-12.1.0_r2android-platform-12.1.0_r19android-platform-12.1.0_r18android-platform-12.1.0_r17android-platform-12.1.0_r16android-platform-12.1.0_r15android-platform-12.1.0_r14android-platform-12.1.0_r13android-platform-12.1.0_r12android-platform-12.1.0_r11android-platform-12.1.0_r10android-platform-12.1.0_r1android-cts-12.1_r1android-12.1.0_r6android-12.1.0_r5android-12.1.0_r4android-12.1.0_r3android-12.1.0_r27android-12.1.0_r2android-12.1.0_r1android12L-s1-releaseandroid12L-releaseandroid12L-platform-releaseAndroid Build Coastguard Worker
2021-12-13[DO NOT MERGE] Fix Conscrypt CTS for sc-v2-dev.android-vts-12.1_r2android-cts-12.1_r2android-12.1.0_r9android-12.1.0_r8android-12.1.0_r7android-12.1.0_r22android-12.1.0_r21android-12.1.0_r20android-12.1.0_r19android-12.1.0_r11android-12.1.0_r10android12-qpr3-s7-releaseandroid12-qpr3-s6-releaseandroid12-qpr3-s5-releaseandroid12-qpr3-s4-releaseandroid12-qpr3-s3-releaseandroid12-qpr3-s2-releaseandroid12-qpr3-s1-releaseandroid12-qpr3-releasePete Bentley
2021-09-30Snap for 7783058 from 03484669b8d6331efcff6769e7ae052c02b6f23f to sc-v2-releaseAndroid Build Coastguard Worker
2021-09-30Merge "[Cherry pick of aosp/1776170] Extra JNI null checks and error fixes." ...TreeHugger Robot
2021-09-29[Cherry Pick of aosp/1778966]Jonathan Scott
2021-09-29[Cherry pick of aosp/1776170]Jonathan Scott
2021-08-14Snap for 7642774 from 9aada76e97def09b790cd4f4dff58f08d93adfbf to sc-v2-releaseAndroid Build Coastguard Worker
2021-08-13[automerger skipped] Merge stage-aosp-sc-ts-dev before making it an upstream ...Xin Li
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-13[automerger skipped] Merge ab/7633965 am: e4dd2272f8 -s oursThe Android Open Source Project
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 7579269 from 46a76b0daa42c40f08fc48240eb7e588a38d0c52 to sc-v2-releaseAndroid Build Coastguard Worker
2021-07-23Update development module version number to 319999900 am: 7c386bb4efAdam Seaton
2021-07-13Update development module version number to 319999900Adam Seaton
2021-07-03Snap for 7521319 from 07702b411de266b87da2709c0f815b5a29f90c34 to sc-v2-releaseAndroid Build Coastguard Worker
2021-07-02Replace ART's core-platform-api stub with module-lib stubs am: 30eded521eVictor Chang
2021-07-02Replace ART's core-platform-api stub with module-lib stubsVictor Chang
2021-06-10Snap for 7442307 from deb18f4144d93a2c0e86c3ae188ad01ad2151a47 to sc-v2-releaseandroid-build-team Robot
2021-06-09Snap for 7438839 from 3c289467f5fde426b545044ca265ebe5f1c2a96b to sc-v2-releaseandroid-build-team Robot
2021-06-08Include sdk versioning proto in conscrypt apex am: 226bfdd77eAnton Hansson
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-07Merge "Set dist_group: "android" for external/conscrypt java_sdk_libraries" i...TreeHugger Robot
2021-06-05Snap for 7430084 from 501eb17905a78b43e3ced1e7ee6e73f24b3d304b to sc-v2-releaseandroid-build-team Robot
2021-06-05Dist conscrypt's CorePlatformApi stubs am: dea8f0ba76Anton Hansson
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 7401515 from 72da197d4a0bdde5a477324db7f205d438c3b5f0 to sc-v2-releaseandroid-build-team Robot
2021-05-26Enable hidden API processing for com.android.conscrypt-bootclasspath-fragment...Paul Duffin
2021-05-25Enable hidden API processing for com.android.conscrypt-bootclasspath-fragmentPaul Duffin
2021-05-25Snap for 7393633 from 7199429719bb33dbfd5d6d7ccda3601ee5f5bcab to sc-v2-releaseandroid-build-team Robot
2021-05-24Replace @link with @code for public alternatives am: 41f0e2d6c0Paul Duffin
2021-05-23Replace @link with @code for public alternativesPaul Duffin
2021-05-21Snap for 7383690 from e030efaaad9276b6d8b7921524aa15516662469e to sc-v2-releaseandroid-build-team Robot
2021-05-20Merge "Make libconscrypt_openjdk_jni visible to vendor" into sc-dev am: 12fb6...Kwang-un Jin
2021-05-20Merge "Make libconscrypt_openjdk_jni visible to vendor" into sc-devKwang-un Jin
2021-05-15Snap for 7365855 from 0721b1749e0e0819cba55fab69c3e799f8bc08be to sc-v2-releaseandroid-build-team Robot
2021-05-15Snap for 7362794 from 2c9bc891eeffb486c89c7bd86410509afd22270b to sc-v2-releaseandroid-build-team Robot
2021-05-14Add bootclasspath_fragment. am: 1081254f5e am: 21fa559e27 am: 58b3fac5ae am: ...satayev
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-v2-releaseandroid-build-team Robot
2021-05-07Merge Conscrypt upstream master. am: b51c989d56 am: 20c8844f41 am: 0ba742fea8...Pete Bentley
2021-05-07Merge Conscrypt upstream master. am: b51c989d56 am: 20c8844f41 am: 0ba742fea8Pete Bentley
2021-05-07Merge Conscrypt upstream master. am: b51c989d56 am: 20c8844f41Pete Bentley