aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2023-11-03Snap for 11044623 from 57489e1f29e94b04da50c9355310abf44f838b19 to 24Q1-releaseandroid-14.0.0_r37android-14.0.0_r36android-14.0.0_r35android-14.0.0_r34android-14.0.0_r33android-14.0.0_r32android-14.0.0_r31android-14.0.0_r30android-14.0.0_r29android14-qpr2-s5-releaseandroid14-qpr2-s4-releaseandroid14-qpr2-s3-releaseandroid14-qpr2-s2-releaseandroid14-qpr2-s1-releaseandroid14-qpr2-releaseAndroid Build Coastguard Worker
Change-Id: I9bde8af23271d5d36bf5247fd5a451af48b8008d
2023-11-02Don't link the brotli executable against libc++. am: a16a99dc1b am: ↵Elliott Hughes
d773d9d666 am: ca23c879b2 Original change: https://android-review.googlesource.com/c/platform/external/brotli/+/2814884 Change-Id: I4fc67cff74cbc53fcc2419aa8c0ca8e8fec39776 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-02Don't link the brotli executable against libc++. am: a16a99dc1b am: ↵Elliott Hughes
a66ff1d6a6 am: 8036de9cc6 Original change: https://android-review.googlesource.com/c/platform/external/brotli/+/2814884 Change-Id: I1f29c82c61435d24dbcaf9106c8f2e8cf376856b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-02Don't link the brotli executable against libc++. am: a16a99dc1b am: d773d9d666Elliott Hughes
Original change: https://android-review.googlesource.com/c/platform/external/brotli/+/2814884 Change-Id: Icc1acdc50b8ad7b938078a83f35ab1dbcc740999 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-02Don't link the brotli executable against libc++. am: a16a99dc1b am: a66ff1d6a6Elliott Hughes
Original change: https://android-review.googlesource.com/c/platform/external/brotli/+/2814884 Change-Id: I3fc07ee836af80eb79b59544f65b5cae8f3149f5 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-02Don't link the brotli executable against libc++. am: a16a99dc1bElliott Hughes
Original change: https://android-review.googlesource.com/c/platform/external/brotli/+/2814884 Change-Id: I955cd8fff94bd6dc609502d385d2360688f166c6 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-02Don't link the brotli executable against libc++. am: a16a99dc1bElliott Hughes
Original change: https://android-review.googlesource.com/c/platform/external/brotli/+/2814884 Change-Id: I1c0c266539b55396fa2542aed906d03b431458bd Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-02Don't link the brotli executable against libc++.Elliott Hughes
Test: ldd `which brotli` Change-Id: Iaff81deb66a85abe6379e6e494fa7bc1b52fb2fc
2023-07-17Allow lpdumpd to link to libbrotli. am: f8663d9bff am: 85afc53c30 am: ↵David Anderson
1972dcbf5d am: 8a6a1c7e60 am: 03d9a8e5b5 Original change: https://android-review.googlesource.com/c/platform/external/brotli/+/2658835 Change-Id: I0e041ba368e443b8c22e92a0a2c333ff3336e9d8 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-17Allow lpdumpd to link to libbrotli. am: f8663d9bff am: 85afc53c30 am: ↵David Anderson
1972dcbf5d am: 8a6a1c7e60 Original change: https://android-review.googlesource.com/c/platform/external/brotli/+/2658835 Change-Id: Id30c9d17b5edfcd20df4e0578c1114c019be99e4 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-17Allow lpdumpd to link to libbrotli. am: f8663d9bff am: 85afc53c30 am: 1972dcbf5dDavid Anderson
Original change: https://android-review.googlesource.com/c/platform/external/brotli/+/2658835 Change-Id: I596cbda9831c1bd61614a2173c83184bb8fefced Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-17Allow lpdumpd to link to libbrotli. am: f8663d9bff am: 85afc53c30David Anderson
Original change: https://android-review.googlesource.com/c/platform/external/brotli/+/2658835 Change-Id: Iaf875f6a6f75144fe304df3150dcee5fcf64e0d5 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-17Allow lpdumpd to link to libbrotli. am: f8663d9bffDavid Anderson
Original change: https://android-review.googlesource.com/c/platform/external/brotli/+/2658835 Change-Id: I3e6fb7ba05a09207296f2ec872ab1c7c1f5dcf27 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-14Allow lpdumpd to link to libbrotli.David Anderson
lpdumpd needs to link to libsnapshot_cow, which requires libbrotli. Bug: 291083311 Test: mm lpdumpd Change-Id: Iedf03d5609c9d321b230c319b44c45a7a3067c3d
2023-03-06Pin tradefed dependencies to Java 11 am: db47d083ac am: 7e25eafe6c am: ↵Frank Feng
888bd290dc am: a120b2bad1 am: 3d47f2abb2 Original change: https://android-review.googlesource.com/c/platform/external/brotli/+/2472147 Change-Id: I8453b9208b852322b2cf091d5b315ad0e248ca86 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-06Pin tradefed dependencies to Java 11 am: db47d083ac am: 7e25eafe6c am: ↵Frank Feng
888bd290dc am: a120b2bad1 am: c3252a88f5 Original change: https://android-review.googlesource.com/c/platform/external/brotli/+/2472147 Change-Id: I77bb5ccad89109126846ae2d5aeaf95f7d0a10c7 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-06Pin tradefed dependencies to Java 11 am: db47d083ac am: 7e25eafe6c am: ↵Frank Feng
888bd290dc am: a120b2bad1 Original change: https://android-review.googlesource.com/c/platform/external/brotli/+/2472147 Change-Id: If88c8b08a3147b4cda3271f6c668371b9be2335e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-06Pin tradefed dependencies to Java 11 am: db47d083ac am: 7e25eafe6c am: ↵android-14.0.0_r45android-14.0.0_r44android-14.0.0_r43android-14.0.0_r42android-14.0.0_r41android-14.0.0_r40android-14.0.0_r39android-14.0.0_r38android-14.0.0_r27android-14.0.0_r26android-14.0.0_r25android-14.0.0_r24android-14.0.0_r23android-14.0.0_r22android-14.0.0_r21android-14.0.0_r20android-14.0.0_r19android-14.0.0_r18android-14.0.0_r17android-14.0.0_r16android14-qpr1-s2-releaseandroid14-qpr1-releaseandroid14-d2-s5-releaseandroid14-d2-s4-releaseandroid14-d2-s3-releaseandroid14-d2-s2-releaseandroid14-d2-s1-releaseandroid14-d2-releaseFrank Feng
888bd290dc am: a120b2bad1 Original change: https://android-review.googlesource.com/c/platform/external/brotli/+/2472147 Change-Id: I4e9c5243eb28b44e37edebfb2238c787593bfd29 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-06Pin tradefed dependencies to Java 11 am: db47d083ac am: 7e25eafe6c am: ↵android14-devFrank Feng
888bd290dc Original change: https://android-review.googlesource.com/c/platform/external/brotli/+/2472147 Change-Id: I3a011c960a6d9157e71bead95a4803b405fec1bd Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-06Pin tradefed dependencies to Java 11 am: db47d083ac am: 7e25eafe6cFrank Feng
Original change: https://android-review.googlesource.com/c/platform/external/brotli/+/2472147 Change-Id: Id14062a2c12f26188c1e43a00f562156329edfee Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-06Pin tradefed dependencies to Java 11 am: db47d083acandroid-u-beta-1-gplFrank Feng
Original change: https://android-review.googlesource.com/c/platform/external/brotli/+/2472147 Change-Id: I1a8ece6c18415ed388d084eab91f1fa0ab4908cb Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-06Pin tradefed dependencies to Java 11Frank Feng
Bug: 267831518 Test: TH Change-Id: I90a6086991b4217f5b429c6352a797f4834947e7
2022-07-04[automerger skipped] Merge "Set min_sdk_version" am: 28b80afe26 am: ↵Treehugger Robot
9ed58c6819 -s ours am: dba429e8b4 -s ours am: b7c9847e01 -s ours am: 35a349b645 -s ours am skip reason: Merged-In Ic4fd84753a2c70972e014cfcb1cd8e4bef0e41d8 with SHA-1 3c8db5a1c2 is already in history Original change: https://android-review.googlesource.com/c/platform/external/brotli/+/2139212 Change-Id: I8ddc4cc0077292d7cca1b7c938fd4283da93f3a2 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-04[automerger skipped] Merge "Set min_sdk_version" am: 28b80afe26 am: ↵main-16k-with-phonesTreehugger Robot
9ed58c6819 -s ours am: dba429e8b4 -s ours am: b7c9847e01 -s ours am skip reason: Merged-In Ic4fd84753a2c70972e014cfcb1cd8e4bef0e41d8 with SHA-1 3c8db5a1c2 is already in history Original change: https://android-review.googlesource.com/c/platform/external/brotli/+/2139212 Change-Id: Id5a29a4c00dd85be00952bc4eca7177f1c40b98f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-04[automerger skipped] Merge "Set min_sdk_version" am: 28b80afe26 am: ↵Treehugger Robot
9ed58c6819 -s ours am: dba429e8b4 -s ours am skip reason: Merged-In Ic4fd84753a2c70972e014cfcb1cd8e4bef0e41d8 with SHA-1 3c8db5a1c2 is already in history Original change: https://android-review.googlesource.com/c/platform/external/brotli/+/2139212 Change-Id: I53ecc48356499a8bba1366178d1c4e820e15f5da Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-04[automerger skipped] Merge "Set min_sdk_version" am: 28b80afe26 am: ↵Treehugger Robot
9ed58c6819 -s ours am skip reason: Merged-In Ic4fd84753a2c70972e014cfcb1cd8e4bef0e41d8 with SHA-1 3c8db5a1c2 is already in history Original change: https://android-review.googlesource.com/c/platform/external/brotli/+/2139212 Change-Id: I284ce67803c3c04e428490f720ca45d0d1d9cdc1 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-04Merge "Set min_sdk_version" am: 28b80afe26main-16kTreehugger Robot
Original change: https://android-review.googlesource.com/c/platform/external/brotli/+/2139212 Change-Id: I50fb583e464a41ddc4cb9cd6c2f96975986c74af Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-04Merge "Set min_sdk_version"Treehugger Robot
2022-06-29Make a libbrotli_encoder_jni shared library from encoder_jni.cc am: ↵Muhammad Haseeb Ahmad
8a3f399d19 am: e3d7f6cc5c am: 5fca7ba801 am: 042cbc9f99 am: 646dd2c814 Original change: https://android-review.googlesource.com/c/platform/external/brotli/+/2134992 Change-Id: I2c727b7cb3fba610b195f6b063e44780dd88dbd0 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-29Make a libbrotli_encoder_jni shared library from encoder_jni.cc am: ↵Muhammad Haseeb Ahmad
8a3f399d19 am: e3d7f6cc5c am: 5fca7ba801 am: 042cbc9f99 Original change: https://android-review.googlesource.com/c/platform/external/brotli/+/2134992 Change-Id: Id78f888ad1ef7762ab965b39a6fcbd5b757b5f23 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-29Make a libbrotli_encoder_jni shared library from encoder_jni.cc am: ↵Muhammad Haseeb Ahmad
8a3f399d19 am: e3d7f6cc5c am: 5fca7ba801 Original change: https://android-review.googlesource.com/c/platform/external/brotli/+/2134992 Change-Id: I3d89c2ca025b2f655b0de2c6056a5f33fc4aad02 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-29Make a libbrotli_encoder_jni shared library from encoder_jni.cc am: ↵Muhammad Haseeb Ahmad
8a3f399d19 am: e3d7f6cc5c Original change: https://android-review.googlesource.com/c/platform/external/brotli/+/2134992 Change-Id: I110a6e6a13919040855d14b76f4d1bbdb324944b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-29Make a libbrotli_encoder_jni shared library from encoder_jni.cc am: 8a3f399d19Muhammad Haseeb Ahmad
Original change: https://android-review.googlesource.com/c/platform/external/brotli/+/2134992 Change-Id: I58d5355ebcc3c011b1d8910c05eab2a701adb0f5 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-29[automerger skipped] Set min_sdk_version am: 3c8db5a1c2 am: 15f4a9c010 am: ↵Jooyung Han
2af4dfee17 -s ours am skip reason: Merged-In Ic4fd84753a2c70972e014cfcb1cd8e4bef0e41d8 with SHA-1 6d3859a0db is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/brotli/+/19083313 Change-Id: Ifca9794dca7c18eab54f3caa434ae676890938df Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-29Set min_sdk_version am: 3c8db5a1c2 am: 15f4a9c010Jooyung Han
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/brotli/+/19083313 Change-Id: Ib29d4607e8092043fbc114f41b4be72687a148f8 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-29Set min_sdk_version am: 3c8db5a1c2Jooyung Han
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/brotli/+/19083313 Change-Id: I57459f82bb22cc686a863458c492a4a37546815b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-28Set min_sdk_versionJooyung Han
This was done via the hard-coded list in build/soong. Bug: 158059172 Test: m Merged-In: Ic4fd84753a2c70972e014cfcb1cd8e4bef0e41d8 Change-Id: Ic4fd84753a2c70972e014cfcb1cd8e4bef0e41d8 (cherry picked from commit 4091c801df08f319189fa09d17300fd573a60c2a)
2022-06-27Set min_sdk_versionJooyung Han
This was done via the hard-coded list in build/soong. Bug: 158059172 Test: m Merged-In: Ic4fd84753a2c70972e014cfcb1cd8e4bef0e41d8 Change-Id: Ic4fd84753a2c70972e014cfcb1cd8e4bef0e41d8
2022-06-24Set min_sdk_versionJooyung Han
This was done via the hard-coded list in build/soong. Bug: 158059172 Test: m Change-Id: Ic4fd84753a2c70972e014cfcb1cd8e4bef0e41d8
2022-06-23Make a libbrotli_encoder_jni shared library from encoder_jni.ccMuhammad Haseeb Ahmad
This is required for the JavaCompressFuzzer: https://r.android.com/2135512 Test: m libbrotli_encoder_jni Bug: 236747140 Change-Id: I5c1ce687618fc4b9a8254d813d4e29b94e83e408
2021-06-02Merge sc-mainline-prodt_frc_tz4_330443010t_frc_swc_330443040t_frc_swc_330443010t_frc_sta_330443010t_frc_sch_330443040t_frc_sch_330443010t_frc_res_330443000t_frc_per_330444010t_frc_odp_330442040t_frc_odp_330442000t_frc_neu_330443030t_frc_neu_330443000t_frc_net_330443000t_frc_med_330443030t_frc_ips_330443010t_frc_ext_330443000t_frc_doc_330543000t_frc_doc_330443060t_frc_doc_330443000t_frc_con_330443020t_frc_cbr_330443000t_frc_ase_330444010t_frc_art_330443060t_frc_adb_330444000android-13.0.0_r83android-13.0.0_r82android-13.0.0_r81android-13.0.0_r80android-13.0.0_r79android-13.0.0_r78android-13.0.0_r77android-13.0.0_r76android-13.0.0_r75android-13.0.0_r74android-13.0.0_r73android-13.0.0_r72android-13.0.0_r71android-13.0.0_r70android-13.0.0_r69android-13.0.0_r68android-13.0.0_r67android-13.0.0_r66android-13.0.0_r65android-13.0.0_r64android-13.0.0_r63android-13.0.0_r62android-13.0.0_r61android-13.0.0_r60android-13.0.0_r59android-13.0.0_r58android-13.0.0_r57android-13.0.0_r56android-13.0.0_r55android-13.0.0_r54android-13.0.0_r53android-13.0.0_r52android-13.0.0_r51android-13.0.0_r50android-13.0.0_r49android-13.0.0_r48android-13.0.0_r47android-13.0.0_r46android-13.0.0_r45android-13.0.0_r44android-13.0.0_r43android-13.0.0_r42android-13.0.0_r41android-13.0.0_r40android-13.0.0_r39android-13.0.0_r38android-13.0.0_r37android-13.0.0_r36android-13.0.0_r35android-13.0.0_r34android-13.0.0_r33android-13.0.0_r32android-13.0.0_r30android-13.0.0_r29android-13.0.0_r28android-13.0.0_r27android-13.0.0_r24android-13.0.0_r23android-13.0.0_r22android-13.0.0_r21android-13.0.0_r20android-13.0.0_r19android-13.0.0_r18android-13.0.0_r17android-13.0.0_r16aml_uwb_331910010aml_uwb_331820070aml_uwb_331613010aml_uwb_331611010aml_uwb_331410010aml_uwb_331310030aml_uwb_331115000aml_uwb_331015040aml_uwb_330810010aml_tz4_332714070aml_tz4_332714050aml_tz4_332714010aml_tz4_331910000aml_tz4_331314030aml_tz4_331314020aml_tz4_331314010aml_tz4_331012050aml_tz4_331012040aml_tz4_331012000aml_go_wif_330911000aml_go_uwb_330912000aml_go_tz4_330912000aml_go_tet_330914010aml_go_swc_330913000aml_go_sta_330911000aml_go_sdk_330810000aml_go_sch_330911000aml_go_res_330912000aml_go_per_330912000aml_go_odp_330913000aml_go_odp_330912000aml_go_neu_330912000aml_go_net_330913000aml_go_mpr_330912000aml_go_med_330913000aml_go_ips_330911000aml_go_ext_330912000aml_go_doc_330912000aml_go_con_330913000aml_go_cbr_330912000aml_go_ase_330913000aml_go_art_330913000aml_go_ads_330915100aml_go_ads_330915000aml_go_ads_330913000aml_go_adb_330913000aml_ase_331311020aml_ase_331112000aml_ase_331011020aml_ads_331920180aml_ads_331814200aml_ads_331710270aml_ads_331611190aml_ads_331511020aml_ads_331418080aml_ads_331131000android13-qpr3-s9-releaseandroid13-qpr3-s8-releaseandroid13-qpr3-s7-releaseandroid13-qpr3-s6-releaseandroid13-qpr3-s5-releaseandroid13-qpr3-s4-releaseandroid13-qpr3-s3-releaseandroid13-qpr3-s2-releaseandroid13-qpr3-s14-releaseandroid13-qpr3-s13-releaseandroid13-qpr3-s12-releaseandroid13-qpr3-s11-releaseandroid13-qpr3-s10-releaseandroid13-qpr3-s1-releaseandroid13-qpr3-releaseandroid13-qpr3-c-s8-releaseandroid13-qpr3-c-s7-releaseandroid13-qpr3-c-s6-releaseandroid13-qpr3-c-s5-releaseandroid13-qpr3-c-s4-releaseandroid13-qpr3-c-s3-releaseandroid13-qpr3-c-s2-releaseandroid13-qpr3-c-s12-releaseandroid13-qpr3-c-s11-releaseandroid13-qpr3-c-s10-releaseandroid13-qpr3-c-s1-releaseandroid13-qpr2-s9-releaseandroid13-qpr2-s8-releaseandroid13-qpr2-s7-releaseandroid13-qpr2-s6-releaseandroid13-qpr2-s5-releaseandroid13-qpr2-s3-releaseandroid13-qpr2-s2-releaseandroid13-qpr2-s12-releaseandroid13-qpr2-s11-releaseandroid13-qpr2-s10-releaseandroid13-qpr2-s1-releaseandroid13-qpr2-releaseandroid13-qpr2-b-s1-releaseandroid13-qpr1-s8-releaseandroid13-qpr1-s7-releaseandroid13-qpr1-s6-releaseandroid13-qpr1-s5-releaseandroid13-qpr1-s4-releaseandroid13-qpr1-s3-releaseandroid13-qpr1-s2-releaseandroid13-qpr1-s1-releaseandroid13-qpr1-releaseandroid13-mainline-uwb-releaseandroid13-mainline-tzdata4-releaseandroid13-mainline-go-wifi-releaseandroid13-mainline-go-uwb-releaseandroid13-mainline-go-tzdata4-releaseandroid13-mainline-go-tethering-releaseandroid13-mainline-go-sdkext-releaseandroid13-mainline-go-scheduling-releaseandroid13-mainline-go-resolv-releaseandroid13-mainline-go-permission-releaseandroid13-mainline-go-os-statsd-releaseandroid13-mainline-go-odp-releaseandroid13-mainline-go-neuralnetworks-releaseandroid13-mainline-go-networking-releaseandroid13-mainline-go-mediaprovider-releaseandroid13-mainline-go-media-swcodec-releaseandroid13-mainline-go-media-releaseandroid13-mainline-go-ipsec-releaseandroid13-mainline-go-extservices-releaseandroid13-mainline-go-documentsui-releaseandroid13-mainline-go-conscrypt-releaseandroid13-mainline-go-cellbroadcast-releaseandroid13-mainline-go-art-releaseandroid13-mainline-go-appsearch-releaseandroid13-mainline-go-adservices-releaseandroid13-mainline-go-adbd-releaseandroid13-mainline-appsearch-releaseandroid13-mainline-adservices-releaseandroid13-frc-scheduling-releaseandroid13-frc-resolv-releaseandroid13-frc-permission-releaseandroid13-frc-os-statsd-releaseandroid13-frc-odp-releaseandroid13-frc-neuralnetworks-releaseandroid13-frc-networking-releaseandroid13-frc-media-swcodec-releaseandroid13-frc-media-releaseandroid13-frc-ipsec-releaseandroid13-frc-extservices-releaseandroid13-frc-documentsui-releaseandroid13-frc-conscrypt-releaseandroid13-frc-cellbroadcast-releaseandroid13-frc-art-releaseandroid13-frc-adbd-releaseandroid13-devandroid13-d4-s2-releaseandroid13-d4-s1-releaseandroid13-d4-releaseandroid13-d3-s1-releaseandroid13-d2-releaseaml_tz4_332714010Xin Li
Bug: 189946434 Change-Id: I284b5cc0f5a36a4783acd75ee75183ab176308fa
2021-05-29[LSC] Add LOCAL_LICENSE_KINDS to external/brotli am: 58dd9b2100 am: ↵Bob Badour
148bc4cd83 am: ec5906fef4 am: 1c330d37c6 am: 8b66c5c07c Original change: https://android-review.googlesource.com/c/platform/external/brotli/+/1588654 Change-Id: I2609f589ec7f7644ecbb0621808f08cb9b6a5f3a
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: d9684f8b93 -s ↵Xin Li
ours am: f249d48c08 -s ours am: ef7d020fc6 -s ours am skip reason: Change-Id I497b79c3890b8221742701ed28e2c53093c98af8 with SHA-1 14a3531d53 is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Icf5bceb8367676a00fdfaa2acba177c4f9279fa8
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: d9684f8b93 -s ↵android-mainline-12.0.0_r99android-mainline-12.0.0_r98android-mainline-12.0.0_r77android-mainline-12.0.0_r70android-mainline-12.0.0_r69android-mainline-12.0.0_r63android-mainline-12.0.0_r59android-mainline-12.0.0_r56android-mainline-12.0.0_r5android-mainline-12.0.0_r49android-mainline-12.0.0_r42android-mainline-12.0.0_r39android-mainline-12.0.0_r22android-mainline-12.0.0_r19android-mainline-12.0.0_r122android-mainline-12.0.0_r115android-mainline-12.0.0_r113android-mainline-12.0.0_r100aml_tz3_311312010android12-mainline-networkstack-releaseandroid12-mainline-art-releaseXin Li
ours am: f249d48c08 -s ours am: ef7d020fc6 -s ours am skip reason: Change-Id I497b79c3890b8221742701ed28e2c53093c98af8 with SHA-1 14a3531d53 is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I3949dd1cddd34152c45e3d9e1cd0a2357b75e965
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: d9684f8b93 -s ↵android-t-preview-2android-t-preview-1android-t-beta-3android-s-v2-preview-2android-s-v2-preview-1android-s-v2-beta-3android-s-v2-beta-2android-s-qpr3-beta-1android-mainline-12.0.0_r4android-mainline-12.0.0_r36android-12.1.0_r9android-12.1.0_r8android-12.1.0_r7android-12.1.0_r26android-12.1.0_r25android-12.1.0_r24android-12.1.0_r23android-12.1.0_r22android-12.1.0_r21android-12.1.0_r20android-12.1.0_r19android-12.1.0_r18android-12.1.0_r17android-12.1.0_r16android-12.1.0_r15android-12.1.0_r14android-12.1.0_r13android-12.1.0_r12android-12.1.0_r11android-12.1.0_r10android-12.0.0_r32android-12.0.0_r29android-12.0.0_r28android-12.0.0_r27android-12.0.0_r26android-12.0.0_r21android-12.0.0_r20android-12.0.0_r19android-12.0.0_r18android-12.0.0_r16android12L-devandroid12L-d2-s8-releaseandroid12L-d2-s7-releaseandroid12L-d2-s6-releaseandroid12L-d2-s5-releaseandroid12L-d2-s4-releaseandroid12L-d2-s3-releaseandroid12L-d2-s2-releaseandroid12L-d2-s1-releaseandroid12L-d2-releaseandroid12-qpr3-s7-releaseandroid12-qpr3-s6-releaseandroid12-qpr3-s5-releaseandroid12-qpr3-s4-releaseandroid12-qpr3-s3-releaseandroid12-qpr3-s2-releaseandroid12-qpr3-s1-releaseandroid12-qpr3-releaseandroid12-qpr1-releaseandroid12-qpr1-d-s3-releaseandroid12-qpr1-d-s2-releaseandroid12-qpr1-d-s1-releaseandroid12-qpr1-d-releaseandroid12-devandroid12--mainline-releaseandroid-t-preview-1android-s-v2-preview-1android-s-v2-beta-3android-s-qpr3-beta-1Xin Li
ours am: f249d48c08 -s ours am skip reason: Change-Id I497b79c3890b8221742701ed28e2c53093c98af8 with SHA-1 14a3531d53 is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I67a008a845693450b8269f57daeee659bacbca64
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: d9684f8b93 -s oursXin Li
am skip reason: Change-Id I497b79c3890b8221742701ed28e2c53093c98af8 with SHA-1 14a3531d53 is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Iac7518c5d3b0d687a1ce112af1ac1c0424894a06
2021-02-20Mark ab/7061308 as merged in stage.android-s-beta-5android-s-beta-4android-s-beta-3android-s-beta-2android-s-beta-1android-s-beta-5android-s-beta-4Xin Li
Bug: 180401296 Merged-In: I497b79c3890b8221742701ed28e2c53093c98af8 Change-Id: I6c778e6c853deb435fc30cae9e351cf23a1d32bc
2021-02-17[LSC] Add LOCAL_LICENSE_KINDS to external/brotli am: 58dd9b2100 am: ↵Bob Badour
148bc4cd83 am: ec5906fef4 am: 1c330d37c6 Original change: https://android-review.googlesource.com/c/platform/external/brotli/+/1588654 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Icdd8095a8fba91f1891feaaddc6d550b8506c7a7
2021-02-17[LSC] Add LOCAL_LICENSE_KINDS to external/brotli am: 58dd9b2100 am: ↵Bob Badour
148bc4cd83 am: ec5906fef4 am: 1c330d37c6 Original change: https://android-review.googlesource.com/c/platform/external/brotli/+/1588654 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ib72a14f6f57638211cc8a1420b910dcd610d03f0
2021-02-17[LSC] Add LOCAL_LICENSE_KINDS to external/brotli am: 58dd9b2100 am: ↵Bob Badour
148bc4cd83 am: ec5906fef4 Original change: https://android-review.googlesource.com/c/platform/external/brotli/+/1588654 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I80664966522bc3a02ccb66daff391d56da90ed10
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-25 12:03:59 +0000