aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2022-06-15Snap for 8730993 from b70917a06af5a5e0687049d49cb1238681d427f4 to ↵aml_tz3_314012070aml_tz3_314012050aml_tz3_314012010aml_tz3_313110000aml_tz3_312511020aml_tz3_312511010aml_tz3_312410020aml_tz3_312410010android12-mainline-tzdata3-releaseaml_tz3_314012010Android Build Coastguard Worker
mainline-tzdata3-release Change-Id: Ib738dc08a760fd0e44170ba3dc681de1a0515e49
2022-05-17Snap for 8603585 from af971b5524a392944a8fd1423b1860f3ab2919ec to ↵Android Build Coastguard Worker
mainline-tzdata3-release Change-Id: I6da79e08e77c7733dfc8907ce24187ffa97a07f1
2022-01-14Merge "Add one visibility to libbz module" am: af1e6935ef am: 5439a186ba am: ↵t_frc_odp_330442040t_frc_odp_330442000t_frc_con_330443020t_frc_cbr_330443000t_frc_ase_330444010t_frc_art_330443060t_frc_adb_330444000android-u-beta-1-gplandroid-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_r16android-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_341513070aml_uwb_341511050aml_uwb_341310300aml_uwb_341310030aml_uwb_341111010aml_uwb_341011000aml_uwb_331910010aml_uwb_331820070aml_uwb_331613010aml_uwb_331611010aml_uwb_331410010aml_uwb_331310030aml_uwb_331115000aml_uwb_331015040aml_uwb_330810010aml_tz5_341510070aml_tz5_341510050aml_tz5_341510010aml_tz4_332714070aml_tz4_332714050aml_tz4_332714010aml_tz4_331910000aml_tz4_331314030aml_tz4_331314020aml_tz4_331314010aml_tz4_331012050aml_tz4_331012040aml_tz4_331012000aml_rkp_341510000aml_rkp_341311000aml_rkp_341114000aml_rkp_341015010aml_rkp_341012000aml_odp_341610000aml_hef_341613000aml_hef_341512030aml_hef_341415040aml_hef_341311010aml_hef_341114030aml_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_ase_330913000aml_go_ads_330915100aml_go_ads_330915000aml_go_ads_330913000aml_go_adb_330913000aml_cfg_341510000aml_ase_341510000aml_ase_341410000aml_ase_341310010aml_ase_341113000aml_ase_340913000aml_ase_331311020aml_ase_331112000aml_ase_331011020aml_ads_341615050aml_ads_341517040aml_ads_341413000aml_ads_341316030aml_ads_341131050aml_ads_341027030aml_ads_340915050aml_ads_331920180aml_ads_331814200aml_ads_331710270aml_ads_331611190aml_ads_331511020aml_ads_331418080aml_ads_331131000main-16k-with-phonesmain-16kandroid14-qpr1-s2-releaseandroid14-qpr1-releaseandroid14-mainline-uwb-releaseandroid14-mainline-healthfitness-releaseandroid14-mainline-appsearch-releaseandroid14-mainline-adservices-releaseandroid14-devandroid13-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-appsearch-releaseandroid13-mainline-go-adservices-releaseandroid13-mainline-go-adbd-releaseandroid13-mainline-appsearch-releaseandroid13-mainline-adservices-releaseandroid13-frc-odp-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_tz5_341510010aml_tz4_332714010Yuntao Xu
38345d94b9 am: c70a30be1f Original change: https://android-review.googlesource.com/c/platform/external/bzip2/+/1945434 Change-Id: Ia29a1ec69235441fa26da20642e3c6c9e6b71c09
2022-01-14Merge "Add one visibility to libbz module" am: af1e6935ef am: 5439a186ba am: ↵Yuntao Xu
38345d94b9 Original change: https://android-review.googlesource.com/c/platform/external/bzip2/+/1945434 Change-Id: I3e2be0cc9693e0c8eea68e81a8a0bd218dfc1e84
2022-01-14Merge "Add one visibility to libbz module" am: af1e6935ef am: 5439a186baYuntao Xu
Original change: https://android-review.googlesource.com/c/platform/external/bzip2/+/1945434 Change-Id: I37e1c61c9501b6f9ad187dc229e6505e7af8d8e3
2022-01-14Merge "Add one visibility to libbz module" am: af1e6935efYuntao Xu
Original change: https://android-review.googlesource.com/c/platform/external/bzip2/+/1945434 Change-Id: Ic329d5e10bb516c00a29a95a0d5c99a87b863064
2022-01-14Merge "Add one visibility to libbz module"android-t-preview-2android-t-preview-1android-t-beta-3android-s-v2-beta-3android-s-qpr3-beta-1android-t-preview-1android-s-v2-beta-3android-s-qpr3-beta-1Yuntao Xu
2022-01-11Add one visibility to libbz moduleYuntao Xu
Added one visibility to the libbz module, to make it visible to moudles in the vendor directory (which is needed to convert Make modules to Soong in the vendor dir of the interal_master branch). Bug: 205649904 Test: m libbz Test: TreeHugger Change-Id: Ia256108d21abdce5dda886ad8113c2d2bbfdac6f
2021-12-13Merge "Really sync with bzip1.0.8." am: 984a9c5ba9 am: f85f90d030 am: ↵Elliott Hughes
019cf7b5e4 am: e86ffaf4a2 Original change: https://android-review.googlesource.com/c/platform/external/bzip2/+/1915250 Change-Id: I1970c819e51a1688fb95cad0640fed28931d0836
2021-12-13Merge "Really sync with bzip1.0.8." am: 984a9c5ba9 am: f85f90d030 am: 019cf7b5e4Elliott Hughes
Original change: https://android-review.googlesource.com/c/platform/external/bzip2/+/1915250 Change-Id: I471bc3886bb2edcc859d06dab6270510b8cc0bcf
2021-12-13Merge "Really sync with bzip1.0.8." am: 984a9c5ba9 am: f85f90d030Elliott Hughes
Original change: https://android-review.googlesource.com/c/platform/external/bzip2/+/1915250 Change-Id: I218d66e4a03d1d64ae956c3fba2de107f12595a1
2021-12-13Merge "Really sync with bzip1.0.8." am: 984a9c5ba9Elliott Hughes
Original change: https://android-review.googlesource.com/c/platform/external/bzip2/+/1915250 Change-Id: I02a24d63d46ffd20cce96c83c209cae5c08b6100
2021-12-13Merge "Really sync with bzip1.0.8."Elliott Hughes
2021-12-08Really sync with bzip1.0.8.Elliott Hughes
The previous git update seems to have gone horribly wrong. Try to dig ourselves out of that hole (at least temporarily; the next merge might be painful too?) by unpacking the current release tarball and checking in the difference. As a double-check, `git diff bzip2-1.0.8` looks good after this change, only showing expected changes like "there's an Android.bp file here that isn't upstream". Bug: http://b/179636234 Test: treehugger Change-Id: Ia9612913e319a1cfa29f0c370f0a3775d8ecb496
2021-06-02Merge sc-mainline-prodXin Li
Bug: 189946434 Change-Id: I8f01788681f66ff68cd4b2aeccdcce5c9bf57c1e
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 3881c145da -s ↵Xin Li
ours am: 4906db6ae5 -s ours am: af4fb9fa8f -s ours am skip reason: Change-Id I395973694367a1ab04cf8b3c3a3a3df5ac63cd52 with SHA-1 825f8f52c4 is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I132e944e5c8635ff32e1e9798dfb9727ea3742a8
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 3881c145da -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: 4906db6ae5 -s ours am: af4fb9fa8f -s ours am skip reason: Change-Id I395973694367a1ab04cf8b3c3a3a3df5ac63cd52 with SHA-1 825f8f52c4 is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Iff0885aad039143a367091bb18bbdfce002d22ed
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 3881c145da -s ↵android-s-v2-preview-2android-s-v2-preview-1android-s-v2-beta-2android-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-s-v2-preview-1Xin Li
ours am: 4906db6ae5 -s ours am skip reason: Change-Id I395973694367a1ab04cf8b3c3a3a3df5ac63cd52 with SHA-1 825f8f52c4 is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I671e5b79af283bba024771c107f5bf36077e5bb0
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 3881c145da -s oursXin Li
am skip reason: Change-Id I395973694367a1ab04cf8b3c3a3a3df5ac63cd52 with SHA-1 825f8f52c4 is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I01d377a2babc97bfcef990637fabaec7d5dd603b
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: I395973694367a1ab04cf8b3c3a3a3df5ac63cd52 Change-Id: I53b8b7b8ffe0b8807c1824780c72b0ddd9e83225
2021-02-17Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/bzip2" am: b37166d895 am: ↵Treehugger Robot
89e54811aa am: 61ca10473c am: 14ffb52936 Original change: https://android-review.googlesource.com/c/platform/external/bzip2/+/1588829 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I08521f01ee993aebecc182c93236ca09a6e56d6f
2021-02-17Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/bzip2" am: b37166d895 am: ↵Treehugger Robot
89e54811aa am: 61ca10473c am: 14ffb52936 Original change: https://android-review.googlesource.com/c/platform/external/bzip2/+/1588829 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: If1073f6f31921598c5befd2ae387acaaee730ebc
2021-02-17Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/bzip2" am: b37166d895 am: ↵Treehugger Robot
89e54811aa am: 61ca10473c Original change: https://android-review.googlesource.com/c/platform/external/bzip2/+/1588829 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I1294ecabc94be2d4cede260d6f8452a2cc063074
2021-02-17Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/bzip2" am: b37166d895 am: ↵Treehugger Robot
89e54811aa Original change: https://android-review.googlesource.com/c/platform/external/bzip2/+/1588829 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Icac8ada24f3d4f239dd6c007234cc145167b0d0c
2021-02-17Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/bzip2" am: b37166d895Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/external/bzip2/+/1588829 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I97c1f9a74d5f8706c62266ebc1be294923b95f20
2021-02-17Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/bzip2"android-s-preview-1Treehugger Robot
2021-02-12[LSC] Add LOCAL_LICENSE_KINDS to external/bzip2Bob Badour
Added SPDX-license-identifier-BSD legacy_unencumbered to: Android.bp Bug: 68860345 Bug: 151177513 Bug: 151953481 Test: m all Exempt-From-Owner-Approval: janitorial work Change-Id: I22d7c58f36a4227732ac28d9275d22d7b8d42423
2021-02-09Merge "Merge commit '6a8690fc8d26c815e798c588f796eabe9d684cf0' into ↵Treehugger Robot
upstream-mas" am: b4ea5c3c54 am: 71f0a6e3bb am: 09d6838ce7 am: b2e4505689 Original change: https://android-review.googlesource.com/c/platform/external/bzip2/+/1580201 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I36e94b7766d7e0f058550385283a8213309aa82f
2021-02-09Merge "Merge commit '6a8690fc8d26c815e798c588f796eabe9d684cf0' into ↵Treehugger Robot
upstream-mas" am: b4ea5c3c54 am: 71f0a6e3bb am: 09d6838ce7 am: b2e4505689 Original change: https://android-review.googlesource.com/c/platform/external/bzip2/+/1580201 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I7b8ff3a3b4b294fa78287475d7c9ec764db66284
2021-02-09Merge "Merge commit '6a8690fc8d26c815e798c588f796eabe9d684cf0' into ↵Treehugger Robot
upstream-mas" am: b4ea5c3c54 am: 71f0a6e3bb am: 09d6838ce7 Original change: https://android-review.googlesource.com/c/platform/external/bzip2/+/1580201 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I951a70c12cc16ad0827b0b2019d86522f6ff60cf
2021-02-09Merge "Merge commit '6a8690fc8d26c815e798c588f796eabe9d684cf0' into ↵Treehugger Robot
upstream-mas" am: b4ea5c3c54 am: 71f0a6e3bb Original change: https://android-review.googlesource.com/c/platform/external/bzip2/+/1580201 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Id56f76519b71ae5044bc2e3fe3f232bade416b4d
2021-02-08Merge "Merge commit '6a8690fc8d26c815e798c588f796eabe9d684cf0' into ↵Treehugger Robot
upstream-mas" am: b4ea5c3c54 Original change: https://android-review.googlesource.com/c/platform/external/bzip2/+/1580201 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I5a777fa5e8cfb5abae10f04c453506225ca99d55
2021-02-08Merge "Merge commit '6a8690fc8d26c815e798c588f796eabe9d684cf0' into ↵Treehugger Robot
upstream-mas"
2021-02-08Merge commit '6a8690fc8d26c815e798c588f796eabe9d684cf0' into upstream-masElliott Hughes
Fix METADATA and get in sync with upstream. Bug: http://b/179636234 Test: treehugger Change-Id: I832ef9ca92e0a577aeea69cb93a0d10969198b27
2020-11-24Mark ab/6881855 as merged am: 72067b0fb4 am: 825f8f52c4Xin Li
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/bzip2/+/13111946 Change-Id: Ic1b4908596bdbfc5a3a0606462a38786414646a4
2020-11-24Mark ab/6881855 as merged am: 72067b0fb4Xin Li
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/bzip2/+/13111946 Change-Id: I395973694367a1ab04cf8b3c3a3a3df5ac63cd52
2020-11-23Mark ab/6881855 as mergedXin Li
Bug: 172690556 Change-Id: Ic7ff06eda9a716782cb4ed09bb121710db262730
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: c6dbbc82eb -s ours am: ↵Xin Li
a606d075f7 -s ours am: fb9deff4e6 -s ours am skip reason: Change-Id Id641096642561af9915b18b899b9123afeb13669 with SHA-1 5e4f974ea5 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/bzip2/+/12796963 Change-Id: I4db9908cb12ea510755070b90893af99324e0971
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: c6dbbc82eb -s ours am: ↵Xin Li
a606d075f7 -s ours am skip reason: Change-Id Id641096642561af9915b18b899b9123afeb13669 with SHA-1 5e4f974ea5 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/bzip2/+/12796963 Change-Id: I20f9d2156d3054243cffa06e58f27d87cd5dc546
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: c6dbbc82eb -s oursXin Li
am skip reason: Change-Id Id641096642561af9915b18b899b9123afeb13669 with SHA-1 5e4f974ea5 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/bzip2/+/12796963 Change-Id: Ie0e2bd0c3c7bb810c7943954fd3fea4b3b9d903a
2020-10-08Skip ab/6749736 in stage.Xin Li
Merged-In: Id641096642561af9915b18b899b9123afeb13669 Change-Id: Ieb95ba69251108be74ab07b75c7fd437301e6c7d
2020-08-27[automerger skipped] Mark Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) as merged am: 867e286057 -s ours am: 66bd02c98b -s ours am: 58dd9ee8ce -s ours am: 7accb6b15b -s ours am skip reason: Change-Id I207b48f559ebeef67028e7273ee46aa07accaf75 with SHA-1 c2e02fb6bf is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/bzip2/+/12469867 Change-Id: I1a82cee829739532c662acf19490ff798f4544fb
2020-08-27[automerger skipped] Mark Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) as merged am: 867e286057 -s ours am: 66bd02c98b -s ours am: 58dd9ee8ce -s ours am skip reason: Change-Id I207b48f559ebeef67028e7273ee46aa07accaf75 with SHA-1 c2e02fb6bf is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/bzip2/+/12469867 Change-Id: Ie06a3bd95f063f4ddfa3a1f9d49fd0ce04b2459c
2020-08-27[automerger skipped] Mark Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) as merged am: 867e286057 -s ours am: 66bd02c98b -s ours am skip reason: Change-Id I207b48f559ebeef67028e7273ee46aa07accaf75 with SHA-1 c2e02fb6bf is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/bzip2/+/12469867 Change-Id: I9c51372b72dfbb0acbab180d272849aca566a636
2020-08-27[automerger skipped] Mark Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) as merged am: 867e286057 -s ours am skip reason: Change-Id I207b48f559ebeef67028e7273ee46aa07accaf75 with SHA-1 c2e02fb6bf is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/bzip2/+/12469867 Change-Id: I9ef9f7f08755b25d41a967d543a13440ae8cc48f
2020-08-27Mark Android R (rvc-dev-plus-aosp-without-vendor@6692709) as mergedXin Li
Bug: 166295507 Merged-In: I207b48f559ebeef67028e7273ee46aa07accaf75 Change-Id: Ic5ec4289ae20d11298ad8d036de66c92683ed362
2020-08-20Merge "Allow libsnapshot to link to libbz." am: 2ef0545ad7 am: 3eb1df41da ↵David Anderson
am: d3f609182f am: 0cda1e14cb am: fb1339d046 Original change: https://android-review.googlesource.com/c/platform/external/bzip2/+/1393619 Change-Id: I259b3588d6e3c9e57c3020e7cd8bc43b3c093f7f
2020-08-20Merge "Allow libsnapshot to link to libbz." am: 2ef0545ad7 am: 3eb1df41da ↵David Anderson
am: d3f609182f am: 0cda1e14cb Original change: https://android-review.googlesource.com/c/platform/external/bzip2/+/1393619 Change-Id: I5f4a8a90fcb7c972d8148abe28c291a9f74a8957
2020-08-20Merge "Allow libsnapshot to link to libbz." am: 2ef0545ad7 am: 3eb1df41da ↵David Anderson
am: d3f609182f Original change: https://android-review.googlesource.com/c/platform/external/bzip2/+/1393619 Change-Id: I2f7519d211c46bd3baf8b09903a059fc591d8dbb
2020-08-20Merge "Allow libsnapshot to link to libbz." am: 2ef0545ad7 am: 3eb1df41daDavid Anderson
Original change: https://android-review.googlesource.com/c/platform/external/bzip2/+/1393619 Change-Id: I08b78692c5d75d358c5a39248501795563720767
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-08 10:51:26 +0000