- 4c2a09a Merge "Enable Windows host compilation of scrypt" am: c09f61a395 by Oystein Eftevaag · 6 weeks ago master
- c09f61a Merge "Enable Windows host compilation of scrypt" by Oystein Eftevaag · 6 weeks ago
- 803fb34 Enable Windows host compilation of scrypt by Oystein Eftevaag · 8 weeks ago
- c3a5fc0 Merge sc-mainline-prod by Xin Li · 1 year, 10 months ago android13-dev android13-frc-adbd-release android13-frc-art-release android13-frc-cellbroadcast-release android13-frc-conscrypt-release android13-frc-documentsui-release android13-frc-extservices-release android13-frc-ipsec-release android13-frc-media-release android13-frc-media-swcodec-release android13-frc-networking-release android13-frc-neuralnetworks-release android13-frc-os-statsd-release android13-frc-permission-release android13-frc-resolv-release android13-frc-scheduling-release android13-mainline-adservices-release android13-mainline-appsearch-release android13-mainline-go-adbd-release android13-mainline-go-adservices-release android13-mainline-go-appsearch-release android13-mainline-go-art-release android13-mainline-go-cellbroadcast-release android13-mainline-go-conscrypt-release android13-mainline-go-documentsui-release android13-mainline-go-extservices-release android13-mainline-go-ipsec-release android13-mainline-go-media-release android13-mainline-go-media-swcodec-release android13-mainline-go-mediaprovider-release android13-mainline-go-networking-release android13-mainline-go-neuralnetworks-release android13-mainline-go-odp-release android13-mainline-go-os-statsd-release android13-mainline-go-permission-release android13-mainline-go-resolv-release android13-mainline-go-scheduling-release android13-mainline-go-sdkext-release android13-mainline-go-tethering-release android13-mainline-go-tzdata4-release android13-mainline-go-uwb-release android13-mainline-go-wifi-release android13-mainline-tzdata4-release android13-mainline-uwb-release android13-qpr1-release android13-qpr1-s1-release android13-qpr1-s2-release android13-qpr1-s3-release android13-qpr1-s4-release android13-qpr1-s5-release android13-qpr1-s6-release android13-qpr1-s7-release android13-qpr1-s8-release android13-qpr2-release android13-qpr2-s1-release android13-qpr2-s2-release android13-qpr2-s3-release android13-qpr2-s5-release android13-qpr2-s6-release main-16k main-16k-with-phones aml_ads_331131000 aml_ads_331418080 aml_ase_331011020 aml_ase_331112000 aml_go_adb_330913000 aml_go_ads_330913000 aml_go_art_330913000 aml_go_ase_330913000 aml_go_cbr_330912000 aml_go_con_330913000 aml_go_doc_330912000 aml_go_ext_330912000 aml_go_ips_330911000 aml_go_med_330913000 aml_go_mpr_330912000 aml_go_net_330913000 aml_go_neu_330912000 aml_go_odp_330912000 aml_go_per_330912000 aml_go_res_330912000 aml_go_sch_330911000 aml_go_sdk_330810000 aml_go_sta_330911000 aml_go_swc_330913000 aml_go_tet_330914010 aml_go_tz4_330912000 aml_go_uwb_330912000 aml_go_wif_330911000 aml_tz4_331012000 aml_tz4_331012040 aml_tz4_331012050 aml_tz4_331314010 aml_tz4_331314020 aml_uwb_330810010 aml_uwb_331015040 aml_uwb_331115000 aml_uwb_331310030 aml_uwb_331410010 android-13.0.0_r16 android-13.0.0_r17 android-13.0.0_r18 android-13.0.0_r19 android-13.0.0_r20 android-13.0.0_r21 android-13.0.0_r22 android-13.0.0_r23 android-13.0.0_r24 android-13.0.0_r27 android-13.0.0_r28 android-13.0.0_r29 android-13.0.0_r30 android-13.0.0_r32 android-13.0.0_r33 android-13.0.0_r34 android-13.0.0_r35 android-13.0.0_r36 android-13.0.0_r37 t_frc_adb_330444000 t_frc_art_330443060 t_frc_ase_330444010 t_frc_cbr_330443000 t_frc_con_330443020 t_frc_doc_330443000 t_frc_doc_330443060 t_frc_doc_330543000 t_frc_ext_330443000 t_frc_ips_330443010 t_frc_med_330443030 t_frc_net_330443000 t_frc_neu_330443000 t_frc_neu_330443030 t_frc_odp_330442000 t_frc_per_330444010 t_frc_res_330443000 t_frc_sch_330443010 t_frc_sch_330443040 t_frc_sta_330443010 t_frc_swc_330443010 t_frc_swc_330443040 t_frc_tz4_330443010
- 56902b9 Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/scrypt" am: bad7e59471 am: 3d08789812 am: bef041db90 am: c91d671264 by Bob Badour · 2 years, 2 months ago
- a301a78 Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/scrypt" am: bad7e59471 am: 3d08789812 am: bef041db90 am: c91d671264 by Bob Badour · 2 years, 2 months ago android12-mainline-art-release android12-mainline-networkstack-release aml_tz3_311312010 android-mainline-12.0.0_r100 android-mainline-12.0.0_r113 android-mainline-12.0.0_r115 android-mainline-12.0.0_r122 android-mainline-12.0.0_r19 android-mainline-12.0.0_r22 android-mainline-12.0.0_r39 android-mainline-12.0.0_r42 android-mainline-12.0.0_r49 android-mainline-12.0.0_r5 android-mainline-12.0.0_r56 android-mainline-12.0.0_r59 android-mainline-12.0.0_r63 android-mainline-12.0.0_r69 android-mainline-12.0.0_r70 android-mainline-12.0.0_r77 android-mainline-12.0.0_r98 android-mainline-12.0.0_r99
- c91d671 Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/scrypt" am: bad7e59471 am: 3d08789812 am: bef041db90 by Bob Badour · 2 years, 2 months ago android-s-qpr3-beta-1 android-s-v2-beta-3 android-s-v2-preview-1 android-t-preview-1 android12--mainline-release android12-dev android12-qpr1-d-release android12-qpr1-d-s1-release android12-qpr1-d-s2-release android12-qpr1-d-s3-release android12-qpr1-release android12-qpr3-release android12-qpr3-s1-release android12-qpr3-s2-release android12-qpr3-s3-release android12-qpr3-s4-release android12-qpr3-s5-release android12-qpr3-s6-release android12-qpr3-s7-release android12L-d2-release android12L-d2-s1-release android12L-d2-s2-release android12L-d2-s3-release android12L-d2-s4-release android12L-d2-s5-release android12L-d2-s6-release android12L-d2-s7-release android12L-d2-s8-release android12L-dev android-12.0.0_r16 android-12.0.0_r18 android-12.0.0_r19 android-12.0.0_r20 android-12.0.0_r21 android-12.0.0_r26 android-12.0.0_r27 android-12.0.0_r28 android-12.0.0_r29 android-12.0.0_r32 android-12.1.0_r10 android-12.1.0_r11 android-12.1.0_r12 android-12.1.0_r13 android-12.1.0_r14 android-12.1.0_r15 android-12.1.0_r16 android-12.1.0_r17 android-12.1.0_r18 android-12.1.0_r19 android-12.1.0_r20 android-12.1.0_r21 android-12.1.0_r22 android-12.1.0_r23 android-12.1.0_r24 android-12.1.0_r25 android-12.1.0_r26 android-12.1.0_r7 android-12.1.0_r8 android-12.1.0_r9 android-mainline-12.0.0_r36 android-mainline-12.0.0_r4 android-s-qpr3-beta-1 android-s-v2-beta-2 android-s-v2-beta-3 android-s-v2-preview-1 android-s-v2-preview-2 android-t-beta-3 android-t-preview-1 android-t-preview-2
- bef041d Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/scrypt" am: bad7e59471 am: 3d08789812 by Bob Badour · 2 years, 2 months ago
- 3d08789 Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/scrypt" am: bad7e59471 by Bob Badour · 2 years, 2 months ago android-s-beta-4 android-s-beta-5 android-s-beta-1 android-s-beta-2 android-s-beta-3 android-s-beta-4 android-s-beta-5
- bad7e59 Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/scrypt" by Bob Badour · 2 years, 2 months ago android-s-preview-1
- 8d9a7b1 [LSC] Add LOCAL_LICENSE_KINDS to external/scrypt by Bob Badour · 2 years, 2 months ago
- 73cfcf7 Merge "Add METADATA to scrypt: Apache2+BSD=NOTICE" am: c284f76b4f am: 4436f99cac am: ce68324d6a am: 0d726f2747 am: dabd9d99c6 by Treehugger Robot · 2 years, 11 months ago
- dabd9d9 Merge "Add METADATA to scrypt: Apache2+BSD=NOTICE" am: c284f76b4f am: 4436f99cac am: ce68324d6a am: 0d726f2747 by Treehugger Robot · 2 years, 11 months ago
- 0d726f2 Merge "Add METADATA to scrypt: Apache2+BSD=NOTICE" am: c284f76b4f am: 4436f99cac am: ce68324d6a by Treehugger Robot · 2 years, 11 months ago
- ce68324 Merge "Add METADATA to scrypt: Apache2+BSD=NOTICE" am: c284f76b4f am: 4436f99cac by Treehugger Robot · 2 years, 11 months ago
- 4436f99 Merge "Add METADATA to scrypt: Apache2+BSD=NOTICE" am: c284f76b4f by Treehugger Robot · 2 years, 11 months ago android-r-beta-2 android-r-beta-3
- c284f76 Merge "Add METADATA to scrypt: Apache2+BSD=NOTICE" by Treehugger Robot · 2 years, 11 months ago
- bded579 Add METADATA to scrypt: Apache2+BSD=NOTICE by Bob Badour · 2 years, 11 months ago
- d6114db [automerger skipped] DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-master by Xin Li · 4 years, 1 month ago android10-c2f2-release android10-c2f2-s1-release android10-c2f2-s2-release android10-d4-release android10-d4-s1-release android10-dev android10-mainline-media-release android10-mainline-networking-release android10-mainline-resolv-release android10-mainline-tzdata-release android10-qpr1-b-release android10-qpr1-b-s1-release android10-qpr1-c-release android10-qpr1-c-s1-release android10-qpr1-d-release android10-qpr1-mainline-release android10-qpr1-release android10-qpr2-release android10-qpr2-s1-release android10-qpr2-s2-release android10-qpr2-s3-release android10-qpr2-s4-release android10-qpr3-release android10-qpr3-s1-release android11-d1-b-release android11-d1-release android11-d1-s1-release android11-d1-s5-release android11-d1-s6-release android11-d1-s7-release android11-d2-release android11-dev android11-gsi android11-mainline-captiveportallogin-release android11-mainline-cellbroadcast-release android11-mainline-conscrypt-release android11-mainline-documentsui-release android11-mainline-extservices-release android11-mainline-media-release android11-mainline-media-swcodec-release android11-mainline-networkstack-release android11-mainline-os-statsd-release android11-mainline-permission-release android11-mainline-release android11-mainline-sparse-2020-dec-release android11-mainline-sparse-2021-jan-release android11-mainline-tethering-release android11-platform-release android11-qpr1-c-release android11-qpr1-d-release android11-qpr1-d-s1-release android11-qpr1-release android11-qpr1-s1-release android11-qpr1-s2-release android11-qpr2-release android11-qpr3-release android11-qpr3-s1-release android11-release android11-s1-release android11-security-release android11-tests-release android12-mainline-tzdata-release ndk-sysroot-r21 android-10.0.0_r12 android-10.0.0_r13 android-10.0.0_r14 android-10.0.0_r15 android-10.0.0_r16 android-10.0.0_r18 android-10.0.0_r19 android-10.0.0_r20 android-10.0.0_r21 android-10.0.0_r22 android-10.0.0_r23 android-10.0.0_r24 android-10.0.0_r25 android-10.0.0_r26 android-10.0.0_r27 android-10.0.0_r28 android-10.0.0_r29 android-10.0.0_r30 android-10.0.0_r31 android-10.0.0_r32 android-10.0.0_r33 android-10.0.0_r34 android-10.0.0_r35 android-10.0.0_r36 android-10.0.0_r37 android-10.0.0_r38 android-10.0.0_r39 android-10.0.0_r40 android-10.0.0_r41 android-10.0.0_r42 android-10.0.0_r43 android-10.0.0_r44 android-10.0.0_r45 android-10.0.0_r7 android-10.0.0_r8 android-10.0.0_r9 android-11.0.0_r1 android-11.0.0_r10 android-11.0.0_r11 android-11.0.0_r12 android-11.0.0_r13 android-11.0.0_r14 android-11.0.0_r15 android-11.0.0_r16 android-11.0.0_r17 android-11.0.0_r18 android-11.0.0_r19 android-11.0.0_r2 android-11.0.0_r20 android-11.0.0_r21 android-11.0.0_r22 android-11.0.0_r23 android-11.0.0_r24 android-11.0.0_r25 android-11.0.0_r26 android-11.0.0_r27 android-11.0.0_r28 android-11.0.0_r29 android-11.0.0_r3 android-11.0.0_r30 android-11.0.0_r31 android-11.0.0_r32 android-11.0.0_r33 android-11.0.0_r34 android-11.0.0_r35 android-11.0.0_r36 android-11.0.0_r37 android-11.0.0_r38 android-11.0.0_r39 android-11.0.0_r4 android-11.0.0_r40 android-11.0.0_r41 android-11.0.0_r42 android-11.0.0_r43 android-11.0.0_r44 android-11.0.0_r45 android-11.0.0_r46 android-11.0.0_r47 android-11.0.0_r48 android-11.0.0_r5 android-11.0.0_r7 android-11.0.0_r8 android-11.0.0_r9 android-cts-11.0_r1 android-cts-11.0_r10 android-cts-11.0_r11 android-cts-11.0_r2 android-cts-11.0_r3 android-cts-11.0_r4 android-cts-11.0_r5 android-cts-11.0_r6 android-cts-11.0_r7 android-cts-11.0_r8 android-cts-11.0_r9 android-mainline-10.0.0_r10 android-mainline-10.0.0_r11 android-mainline-10.0.0_r12 android-mainline-10.0.0_r13 android-mainline-10.0.0_r4 android-mainline-10.0.0_r5 android-mainline-10.0.0_r6 android-mainline-10.0.0_r7 android-mainline-10.0.0_r8 android-mainline-10.0.0_r9 android-mainline-11.0.0_r1 android-mainline-11.0.0_r10 android-mainline-11.0.0_r12 android-mainline-11.0.0_r13 android-mainline-11.0.0_r14 android-mainline-11.0.0_r15 android-mainline-11.0.0_r16 android-mainline-11.0.0_r17 android-mainline-11.0.0_r18 android-mainline-11.0.0_r19 android-mainline-11.0.0_r2 android-mainline-11.0.0_r20 android-mainline-11.0.0_r21 android-mainline-11.0.0_r22 android-mainline-11.0.0_r23 android-mainline-11.0.0_r24 android-mainline-11.0.0_r25 android-mainline-11.0.0_r26 android-mainline-11.0.0_r27 android-mainline-11.0.0_r28 android-mainline-11.0.0_r29 android-mainline-11.0.0_r3 android-mainline-11.0.0_r30 android-mainline-11.0.0_r31 android-mainline-11.0.0_r32 android-mainline-11.0.0_r33 android-mainline-11.0.0_r34 android-mainline-11.0.0_r35 android-mainline-11.0.0_r36 android-mainline-11.0.0_r37 android-mainline-11.0.0_r38 android-mainline-11.0.0_r39 android-mainline-11.0.0_r4 android-mainline-11.0.0_r40 android-mainline-11.0.0_r41 android-mainline-11.0.0_r42 android-mainline-11.0.0_r43 android-mainline-11.0.0_r44 android-mainline-11.0.0_r45 android-mainline-11.0.0_r5 android-mainline-11.0.0_r6 android-mainline-11.0.0_r7 android-mainline-11.0.0_r8 android-mainline-11.0.0_r9 android-mainline-12.0.0_r111 android-mainline-12.0.0_r54 android-mainline-12.0.0_r55 android-platform-11.0.0_r1 android-platform-11.0.0_r10 android-platform-11.0.0_r11 android-platform-11.0.0_r12 android-platform-11.0.0_r13 android-platform-11.0.0_r14 android-platform-11.0.0_r15 android-platform-11.0.0_r16 android-platform-11.0.0_r17 android-platform-11.0.0_r18 android-platform-11.0.0_r19 android-platform-11.0.0_r2 android-platform-11.0.0_r20 android-platform-11.0.0_r21 android-platform-11.0.0_r22 android-platform-11.0.0_r23 android-platform-11.0.0_r24 android-platform-11.0.0_r25 android-platform-11.0.0_r26 android-platform-11.0.0_r27 android-platform-11.0.0_r28 android-platform-11.0.0_r3 android-platform-11.0.0_r4 android-platform-11.0.0_r5 android-platform-11.0.0_r6 android-platform-11.0.0_r7 android-platform-11.0.0_r8 android-platform-11.0.0_r9 android-r-preview-1 android-r-preview-2 android-r-preview-3 android-r-preview-4 android-security-11.0.0_r1 android-security-11.0.0_r49 android-security-11.0.0_r50 android-security-11.0.0_r51 android-security-11.0.0_r52 android-security-11.0.0_r53 android-security-11.0.0_r54 android-security-11.0.0_r55 android-security-11.0.0_r56 android-security-11.0.0_r57 android-security-11.0.0_r58 android-security-11.0.0_r59 android-security-11.0.0_r60 android-security-11.0.0_r61 android-security-11.0.0_r62 android-security-11.0.0_r63 android-security-11.0.0_r64 android-security-11.0.0_r65 android-vts-11.0_r1 android-vts-11.0_r10 android-vts-11.0_r11 android-vts-11.0_r2 android-vts-11.0_r3 android-vts-11.0_r4 android-vts-11.0_r5 android-vts-11.0_r6 android-vts-11.0_r7 android-vts-11.0_r8 android-vts-11.0_r9 q_tzdata_aml_294400310 q_tzdata_aml_295500001 q_tzdata_aml_295500002 q_tzdata_aml_295600110
- 12c1e37 DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-master by Xin Li · 4 years, 1 month ago android-o-mr1-iot-release-1.0.13 android-o-mr1-iot-release-1.0.14
