aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2021-12-22Adding bluetooth apex am: 68ed6c6d0d am: c02cb1ee15 am: d80c881bfa am: ↵t_frc_odp_330442040t_frc_odp_330442000t_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_ase_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-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_tz4_332714010Roopa Sattiraju
c5bf921444 Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/libz-sys/+/1931482 Change-Id: I956bb16670e8770f2ea9d5d2f700d7c7a0b67657
2021-12-22Adding bluetooth apex am: 68ed6c6d0d am: c02cb1ee15 am: d80c881bfaRoopa Sattiraju
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/libz-sys/+/1931482 Change-Id: If7efae7ce347a4e8837db87b43eff222820b763b
2021-12-22Adding bluetooth apex am: 68ed6c6d0d am: c02cb1ee15Roopa Sattiraju
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/libz-sys/+/1931482 Change-Id: Ia043b5a4c072ecacb56f63a69beeeebb0d783af2
2021-12-22Adding bluetooth apex am: 68ed6c6d0dRoopa Sattiraju
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/libz-sys/+/1931482 Change-Id: Ica10927aeadc000743064a152cb0eeb28a5c3ec5
2021-12-21Adding bluetooth apexandroid-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-1Roopa Sattiraju
Bug: 206121418 Test: Compile Change-Id: Ie6dc4e170cf62138411662bd81cf09253e7756f7
2021-12-15Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING." am: 08002afc50 ↵Joel Galenson
am: 6179ba6967 am: 3e3d5a03a8 am: 978f1ea19c Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/libz-sys/+/1912678 Change-Id: I58a00b20e177c7c6e7787e3b1e344e8a02e5a971
2021-12-15Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING." am: 08002afc50 ↵Joel Galenson
am: 6179ba6967 am: 3e3d5a03a8 Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/libz-sys/+/1912678 Change-Id: I25f71964d43656d6be38286567632cc065378546
2021-12-15Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING." am: 08002afc50 ↵Joel Galenson
am: 6179ba6967 Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/libz-sys/+/1912678 Change-Id: I554061884acee5c28190f774cda6d87a49213edb
2021-12-15Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING." am: 08002afc50Joel Galenson
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/libz-sys/+/1912678 Change-Id: Iff184a14695ffc742e2a87f475e5fec86cf131a9
2021-12-15Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING."Joel Galenson
2021-12-10Refresh Android.bp, cargo2android.json, TEST_MAPPING.Joel Galenson
Test: None Change-Id: I32b18b47588a34fb6db5d3bf2a06e5b39d3510da
2021-09-20Remove external/rust/crates/libz-sys/.gitmodules. am: c1ff7308ad am: ↵Raman Tenneti
15b505efdc am: 69b178104a am: d3be95ed51 am: 7790eec89a Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/libz-sys/+/1830388 Change-Id: I9abac14a9241a091e8313f0b3591133c2bf0888e
2021-09-20Remove external/rust/crates/libz-sys/.gitmodules. am: c1ff7308ad am: ↵Raman Tenneti
15b505efdc am: 69b178104a am: d3be95ed51 Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/libz-sys/+/1830388 Change-Id: I97f8d8d3a629f2218cf3eb51994a2a07474e8375
2021-09-20Remove external/rust/crates/libz-sys/.gitmodules. am: c1ff7308ad am: ↵Raman Tenneti
15b505efdc am: 69b178104a Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/libz-sys/+/1830388 Change-Id: Iafa87c2701d4201e10a1f45125f4bcd957acce8c
2021-09-20Remove external/rust/crates/libz-sys/.gitmodules. am: c1ff7308ad am: 15b505efdcRaman Tenneti
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/libz-sys/+/1830388 Change-Id: I886c6fa2900fbce8cb215c75ca80610b06e4d421
2021-09-20Remove external/rust/crates/libz-sys/.gitmodules. am: c1ff7308adandroid-s-v2-preview-2android-s-v2-preview-1android-s-v2-beta-2android-s-v2-preview-1Raman Tenneti
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/libz-sys/+/1830388 Change-Id: Ied4790b9e5b6018f10f2b6f6cb4d137acf31f831
2021-09-17Remove external/rust/crates/libz-sys/.gitmodules.Raman Tenneti
git doesn't support submodules in external directory. Didn't remove the following directories because they have files. src/zlib and src/zlib-ng Bug: 152899985 Test: Presubmit-Verify Change-Id: I3973aeec8f7e19c3bbe1746ce50fff72c333da1e
2021-08-24Update TEST_MAPPING am: fe97a5ef3b am: 06b8d089b4 am: baec40871d am: ↵Joel Galenson
5c06e5d483 am: 4f46b90546 Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/libz-sys/+/1806180 Change-Id: I3893aa3a987626438a46e5af10d88001e603a100
2021-08-24Update TEST_MAPPING am: fe97a5ef3b am: 06b8d089b4 am: baec40871d am: 5c06e5d483Joel Galenson
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/libz-sys/+/1806180 Change-Id: I5a48ae68b3df7116c5da82427cdb7c64c174b7b9
2021-08-24Update TEST_MAPPING am: fe97a5ef3b am: 06b8d089b4 am: baec40871dJoel Galenson
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/libz-sys/+/1806180 Change-Id: Ib7e31ac70d4d749d5d40a4fbdb26afcd100c8b45
2021-08-24Update TEST_MAPPING am: fe97a5ef3b am: 06b8d089b4Joel Galenson
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/libz-sys/+/1806180 Change-Id: I715bbc6aa470f2b3be49923c1c90a5dfcf40fb26
2021-08-24Update TEST_MAPPING am: fe97a5ef3bJoel Galenson
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/libz-sys/+/1806180 Change-Id: Ic6b27728f10545b82b6cfd40f6ac1bde17deea66
2021-08-23Update TEST_MAPPINGandroid-s-beta-5android-s-beta-5Joel Galenson
Test: None Change-Id: Ie6797e9e6ded609d88e7f78bc3f3c40268b62fe4
2021-06-28make the lib available to com.android.virt am: 02ab0708bb am: f625921778 am: ↵Jooyung Han
40e0441bd0 am: a07921d4b5 Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/libz-sys/+/1748448 Change-Id: Icaefc9508dd1cf07c26e014ba172914767d20b6f
2021-06-28make the lib available to com.android.virt am: 02ab0708bb am: f625921778 am: ↵Jooyung Han
40e0441bd0 Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/libz-sys/+/1748448 Change-Id: I64a0bf1bd8bc9e1970a4f2d87d701db1349bc083
2021-06-28make the lib available to com.android.virt am: 02ab0708bb am: f625921778Jooyung Han
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/libz-sys/+/1748448 Change-Id: I9701ea79271e8cf9480d22e90df1200d7176fdbb
2021-06-28make the lib available to com.android.virt am: 02ab0708bbJooyung Han
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/libz-sys/+/1748448 Change-Id: Ia00a226e8b7dd306135c2752979ea3a65e27d99d
2021-06-29make the lib available to com.android.virtandroid-s-beta-4android-s-beta-3android-s-beta-4Jooyung Han
Bug: 190503456 Test: c2a Test: MicrodroidHostTestCases Change-Id: I8aa50e09364bf7cb0ef30279c98045dd2e8828a3
2021-06-02Merge sc-mainline-prodXin Li
Bug: 189946434 Change-Id: I6e5381788c3ad61159657d5e39a0db59ef94c063
2021-06-01Upgrade rust/crates/libz-sys to 1.1.3 am: 78439ebe89 am: e0ae7cbb8e am: ↵Joel Galenson
7a6148bd2c am: 67a9deb035 Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/libz-sys/+/1713008 Change-Id: I33a1757c95393947bd3f9d47b2e62f31cf7a3e1f
2021-06-01Upgrade rust/crates/libz-sys to 1.1.3 am: 78439ebe89 am: e0ae7cbb8e am: ↵Joel Galenson
7a6148bd2c Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/libz-sys/+/1713008 Change-Id: I8680ac3391cf986e59520eb9b4640cf49e0eb7e5
2021-06-01Upgrade rust/crates/libz-sys to 1.1.3 am: 78439ebe89 am: e0ae7cbb8eJoel Galenson
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/libz-sys/+/1713008 Change-Id: Ica89ccd8f5ef15d06e572e7c633e973226194463
2021-06-01Upgrade rust/crates/libz-sys to 1.1.3 am: 78439ebe89Joel Galenson
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/libz-sys/+/1713008 Change-Id: I8e487ab3f42016e8c9d9fa10afd522a4fed4c29d
2021-06-01Upgrade rust/crates/libz-sys to 1.1.3Joel Galenson
Test: make Change-Id: I70d104f6d14e59569078b22e2236a2c8792827c2
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 1e92575ee2 -s ↵Xin Li
ours am: c7d6a08b8a -s ours am: f105bf8538 -s ours am skip reason: Change-Id I515cf40fea094e30360579b46ff0166d89ed0e0b with SHA-1 8bd333584f is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I5c657fc801ebaab637e6d378b531fedcb146f74e
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 1e92575ee2 -s ↵android-mainline-12.0.0_r99android-mainline-12.0.0_r98android-mainline-12.0.0_r97android-mainline-12.0.0_r96android-mainline-12.0.0_r95android-mainline-12.0.0_r94android-mainline-12.0.0_r93android-mainline-12.0.0_r92android-mainline-12.0.0_r91android-mainline-12.0.0_r90android-mainline-12.0.0_r9android-mainline-12.0.0_r89android-mainline-12.0.0_r88android-mainline-12.0.0_r87android-mainline-12.0.0_r86android-mainline-12.0.0_r85android-mainline-12.0.0_r84android-mainline-12.0.0_r83android-mainline-12.0.0_r82android-mainline-12.0.0_r81android-mainline-12.0.0_r80android-mainline-12.0.0_r8android-mainline-12.0.0_r79android-mainline-12.0.0_r78android-mainline-12.0.0_r77android-mainline-12.0.0_r76android-mainline-12.0.0_r75android-mainline-12.0.0_r74android-mainline-12.0.0_r73android-mainline-12.0.0_r72android-mainline-12.0.0_r71android-mainline-12.0.0_r70android-mainline-12.0.0_r7android-mainline-12.0.0_r69android-mainline-12.0.0_r68android-mainline-12.0.0_r67android-mainline-12.0.0_r66android-mainline-12.0.0_r65android-mainline-12.0.0_r64android-mainline-12.0.0_r63android-mainline-12.0.0_r62android-mainline-12.0.0_r61android-mainline-12.0.0_r60android-mainline-12.0.0_r6android-mainline-12.0.0_r59android-mainline-12.0.0_r58android-mainline-12.0.0_r57android-mainline-12.0.0_r56android-mainline-12.0.0_r53android-mainline-12.0.0_r52android-mainline-12.0.0_r51android-mainline-12.0.0_r50android-mainline-12.0.0_r5android-mainline-12.0.0_r49android-mainline-12.0.0_r48android-mainline-12.0.0_r47android-mainline-12.0.0_r46android-mainline-12.0.0_r45android-mainline-12.0.0_r44android-mainline-12.0.0_r43android-mainline-12.0.0_r42android-mainline-12.0.0_r41android-mainline-12.0.0_r40android-mainline-12.0.0_r39android-mainline-12.0.0_r38android-mainline-12.0.0_r37android-mainline-12.0.0_r35android-mainline-12.0.0_r34android-mainline-12.0.0_r33android-mainline-12.0.0_r32android-mainline-12.0.0_r31android-mainline-12.0.0_r30android-mainline-12.0.0_r3android-mainline-12.0.0_r29android-mainline-12.0.0_r28android-mainline-12.0.0_r27android-mainline-12.0.0_r26android-mainline-12.0.0_r25android-mainline-12.0.0_r24android-mainline-12.0.0_r23android-mainline-12.0.0_r22android-mainline-12.0.0_r21android-mainline-12.0.0_r20android-mainline-12.0.0_r2android-mainline-12.0.0_r19android-mainline-12.0.0_r18android-mainline-12.0.0_r17android-mainline-12.0.0_r16android-mainline-12.0.0_r15android-mainline-12.0.0_r14android-mainline-12.0.0_r13android-mainline-12.0.0_r126android-mainline-12.0.0_r125android-mainline-12.0.0_r124android-mainline-12.0.0_r123android-mainline-12.0.0_r122android-mainline-12.0.0_r121android-mainline-12.0.0_r120android-mainline-12.0.0_r12android-mainline-12.0.0_r119android-mainline-12.0.0_r118android-mainline-12.0.0_r117android-mainline-12.0.0_r116android-mainline-12.0.0_r115android-mainline-12.0.0_r114android-mainline-12.0.0_r113android-mainline-12.0.0_r110android-mainline-12.0.0_r11android-mainline-12.0.0_r109android-mainline-12.0.0_r108android-mainline-12.0.0_r107android-mainline-12.0.0_r106android-mainline-12.0.0_r105android-mainline-12.0.0_r104android-mainline-12.0.0_r103android-mainline-12.0.0_r102android-mainline-12.0.0_r101android-mainline-12.0.0_r100android-mainline-12.0.0_r10android-mainline-12.0.0_r1aml_wif_311811030aml_tz3_311312010aml_tet_311811050aml_sdk_311710000aml_pco_311011000aml_mpr_311911090aml_doc_310851020android12-mainline-wifi-releaseandroid12-mainline-tethering-releaseandroid12-mainline-statsd-releaseandroid12-mainline-sdkext-releaseandroid12-mainline-resolv-releaseandroid12-mainline-permission-releaseandroid12-mainline-neuralnetworks-releaseandroid12-mainline-networkstack-releaseandroid12-mainline-mediaprovider-releaseandroid12-mainline-media-swcodec-releaseandroid12-mainline-media-releaseandroid12-mainline-ipsec-releaseandroid12-mainline-extservices-releaseandroid12-mainline-documentsui-releaseandroid12-mainline-conscrypt-releaseandroid12-mainline-cellbroadcast-releaseandroid12-mainline-captiveportallogin-releaseandroid12-mainline-art-releaseandroid12-mainline-adbd-releaseXin Li
ours am: c7d6a08b8a -s ours am: f105bf8538 -s ours am skip reason: Change-Id I515cf40fea094e30360579b46ff0166d89ed0e0b with SHA-1 8bd333584f is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Id45f5b60ddc2ba937e178f28360f6bcc12e11638
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 1e92575ee2 -s ↵android-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-releaseXin Li
ours am: c7d6a08b8a -s ours am skip reason: Change-Id I515cf40fea094e30360579b46ff0166d89ed0e0b with SHA-1 8bd333584f is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ibabe562bcaaabfde8336e6102b234af1b653ccc9
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 1e92575ee2 -s oursXin Li
am skip reason: Change-Id I515cf40fea094e30360579b46ff0166d89ed0e0b with SHA-1 8bd333584f is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Iace25788ce049f2780c1897569a84d991b0aaf8d
2021-02-20Mark ab/7061308 as merged in stage.android-s-beta-2android-s-beta-1Xin Li
Bug: 180401296 Merged-In: I515cf40fea094e30360579b46ff0166d89ed0e0b Change-Id: I22312b454060168d6262a9a20781abcd9dce8b71
2021-02-16[LSC] Add LOCAL_LICENSE_KINDS to external/rust/crates/libz-sys am: ↵Bob Badour
2ca6853819 am: c45c216178 am: b7efa2208b am: 744e2f79ae Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/libz-sys/+/1588669 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I96348e197c817b1f3b582c9ad97ff70ecf967882
2021-02-16[LSC] Add LOCAL_LICENSE_KINDS to external/rust/crates/libz-sys am: ↵Bob Badour
2ca6853819 am: c45c216178 am: b7efa2208b am: 744e2f79ae Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/libz-sys/+/1588669 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I0cee0536a2b45cc7becc53a79f7a3914c2be62a0
2021-02-16[LSC] Add LOCAL_LICENSE_KINDS to external/rust/crates/libz-sys am: ↵Bob Badour
2ca6853819 am: c45c216178 am: b7efa2208b Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/libz-sys/+/1588669 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ifcdafdf940700b5c6358b7a31984f69294e47cc1
2021-02-16[LSC] Add LOCAL_LICENSE_KINDS to external/rust/crates/libz-sys am: ↵Bob Badour
2ca6853819 am: c45c216178 Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/libz-sys/+/1588669 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I3b63cb01a305aa0e71cc0919aee39e2bcb55993c
2021-02-16[LSC] Add LOCAL_LICENSE_KINDS to external/rust/crates/libz-sys am: 2ca6853819Bob Badour
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/libz-sys/+/1588669 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I3da7323603e516bd302b8c6bb6b3644011a8d47f
2021-02-12[LSC] Add LOCAL_LICENSE_KINDS to external/rust/crates/libz-sysandroid-s-preview-1Bob Badour
Added SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-BSD SPDX-license-identifier-BSL-1.0 SPDX-license-identifier-CC-BY SPDX-license-identifier-ISC SPDX-license-identifier-MIT SPDX-license-identifier-Zlib legacy_permissive legacy_unencumbered to: Android.bp Bug: 68860345 Bug: 151177513 Bug: 151953481 Test: m all Exempt-From-Owner-Approval: janitorial work Change-Id: I9f294551f6e2a2fb21f96960adb069477830a410
2021-02-12Clean up rust_test_host TEST_MAPPING after default update am: b1005cf632 am: ↵Julien Desprez
f89968cee8 am: 6473e89458 am: 8582a8fba9 Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/libz-sys/+/1584585 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ibccfa8069371282a9f364992de72c32e1ea1d419
2021-02-12Clean up rust_test_host TEST_MAPPING after default update am: b1005cf632 am: ↵Julien Desprez
f89968cee8 am: 6473e89458 am: 8582a8fba9 Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/libz-sys/+/1584585 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ibbef447e59a47369feb0a3228c565f1107258743
2021-02-12Clean up rust_test_host TEST_MAPPING after default update am: b1005cf632 am: ↵Julien Desprez
f89968cee8 am: 6473e89458 Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/libz-sys/+/1584585 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Idede0e17a784199f66502e1e976f65cd024cf989
2021-02-11Clean up rust_test_host TEST_MAPPING after default update am: b1005cf632 am: ↵Julien Desprez
f89968cee8 Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/libz-sys/+/1584585 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I1eb5616521a8cb08367516620f854004f6a11eea
2021-02-11Clean up rust_test_host TEST_MAPPING after default update am: b1005cf632Julien Desprez
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/libz-sys/+/1584585 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ib70bd53ddd04acbb1ab25f9e16095542e208b8d2