aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
6 daysRe-run cargo_embargo to update Android.bp.HEADmastermainAndrew Walbran
Test: ran cargo_embargo Change-Id: I992bff7a213fba44a258522d1d7e1ffbd01d8fd9
2024-05-08Update Android.bp by running cargo_embargoJames Farrell
Test: ran cargo_embargo Change-Id: Id14646626393abb4ded30896976d979d535f61a6
2023-11-14Migrate to cargo_embargo. am: e0fa966410 am: 5fd703374a am: 65e7432550Andrew Walbran
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/combine/+/2826452 Change-Id: I584b274e482fd1f38e46c3f80349f6f8887e687e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-14Migrate to cargo_embargo. am: e0fa966410 am: 9537b47e45 am: c0f8982fffAndrew Walbran
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/combine/+/2826452 Change-Id: Ia8293a26f1ecb39932e75503f4f39e1ba928de51 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-14Migrate to cargo_embargo. am: e0fa966410 am: 5fd703374aAndrew Walbran
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/combine/+/2826452 Change-Id: I4d93ffab68c97d00ed904c382928dd58455053e6 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-14Migrate to cargo_embargo. am: e0fa966410 am: 9537b47e45Andrew Walbran
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/combine/+/2826452 Change-Id: I79c67f56005079e29a2a8fd71c9aa876d834da13 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-14Migrate to cargo_embargo. am: e0fa966410Andrew Walbran
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/combine/+/2826452 Change-Id: I8152459408c650de5e4519465fc3d14a98442ccd Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-14Migrate to cargo_embargo. am: e0fa966410Andrew Walbran
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/combine/+/2826452 Change-Id: Ibae4cb1ae609e164ae547604473b29c0e3de44ae Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-10Migrate to cargo_embargo.Andrew Walbran
Bug: 293289578 Test: Ran cargo_embargo, compared Android.bp Change-Id: Ifccb8cae09d59f0b835ace4a753a001c91779818
2023-07-18Move OWNER reference master=>main. am: b539e5b867 am: edb7508b0a am: ↵Sam Saccone
f66e6a42c8 am: 10c6a836ff am: 7c40f94b23 Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/combine/+/2661143 Change-Id: I829b4d834f6964279b5fbe170b8654709d63763b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-18Move OWNER reference master=>main. am: b539e5b867 am: edb7508b0a am: ↵Sam Saccone
f66e6a42c8 am: 10c6a836ff Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/combine/+/2661143 Change-Id: I07ab68f88c964d11d64c94ec705f45cc314255bc Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-18Move OWNER reference master=>main. am: b539e5b867 am: edb7508b0a am: f66e6a42c8Sam Saccone
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/combine/+/2661143 Change-Id: I4ce002eff2cbea3106199d4d96866338a3c45a2c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-18Move OWNER reference master=>main. am: b539e5b867 am: edb7508b0aSam Saccone
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/combine/+/2661143 Change-Id: Ib1b1e32ee8c72a813309109994471dcc378f87f1 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-18Move OWNER reference master=>main. am: b539e5b867Sam Saccone
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/combine/+/2661143 Change-Id: Icb79778f0439068ea5766359bca120c4abe64b8a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-18Move OWNER reference master=>main.Sam Saccone
BUG=b/291759353 Change-Id: I3cc9426c7f7df59ad69a18b1d83f185a56ac4756
2023-03-09Merge "Make combine available to product and vendor am: e8c4d709a6 am: ↵Automerger Merge Worker
89821a87d7 am: d9537ba148 am: d90f718c62 am: eac30b1d0c"
2023-03-09Make combine available to product and vendor am: e8c4d709a6 am: 89821a87d7 ↵Matthew Maurer
am: d9537ba148 am: d90f718c62 am: eac30b1d0c Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/combine/+/2476364 Change-Id: I2b68dc0d402102aa72da4f3d87428043a3279773 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-09Make combine available to product and vendor am: e8c4d709a6 am: 89821a87d7 ↵Matthew Maurer
am: d9537ba148 am: d90f718c62 am: b256f85f3e Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/combine/+/2476364 Change-Id: I116bb8dbf7e9477016dad0e82fb51840b8b156b4 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-09Make combine available to product and vendor am: e8c4d709a6 am: 89821a87d7 ↵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-releaseMatthew Maurer
am: d9537ba148 am: d90f718c62 Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/combine/+/2476364 Change-Id: I3bded027d2ed99ffde043313de1c8bb78e603b08 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-09Make combine available to product and vendor am: e8c4d709a6 am: 89821a87d7 ↵Matthew Maurer
am: d9537ba148 am: d90f718c62 Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/combine/+/2476364 Change-Id: I560d2dad54a673b016c726b98cd511e827f808bb Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-09Make combine available to product and vendor am: e8c4d709a6 am: 89821a87d7 ↵android14-devMatthew Maurer
am: d9537ba148 Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/combine/+/2476364 Change-Id: Ia1821b4605ca4e3be2c8bc52040aedb091ef6f22 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-09Make combine available to product and vendor am: e8c4d709a6 am: 89821a87d7Matthew Maurer
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/combine/+/2476364 Change-Id: Iecafa71558c8f732c35f4df1da15bcab96a539e1 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-09Make combine available to product and vendor am: e8c4d709a6android-u-beta-1-gplMatthew Maurer
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/combine/+/2476364 Change-Id: I1407b8ea9aafd1e49ad6312931a8b3572a960304 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-07Make combine available to product and vendorMatthew Maurer
Bug: 270690570 Test: mma in external/rust/crates Change-Id: Id2888eb3a2c889e4c35042f2ac88c110a5a60f80
2022-12-09Upgrade combine to 4.6.6 am: 8d75b00921 am: 646bede66f am: a5e6f25965Jeff Vander Stoep
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/combine/+/2335682 Change-Id: I951e21661c793c972ee0d821b1bed7e7856857d4 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-09Upgrade combine to 4.6.6 am: 8d75b00921 am: 646bede66fJeff Vander Stoep
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/combine/+/2335682 Change-Id: Ie2587f6ce1192bc9f6abbffbbd809c5d5fb3ff00 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-09Upgrade combine to 4.6.6 am: 8d75b00921main-16k-with-phonesJeff Vander Stoep
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/combine/+/2335682 Change-Id: I71a68930008a7c6a8ebfff9fe73caf6a80d4d0c9 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-08Upgrade combine to 4.6.6Jeff Vander Stoep
This project was upgraded with external_updater. Usage: tools/external_updater/updater.sh update rust/crates/combine For more info, check https://cs.android.com/android/platform/superproject/+/master:tools/external_updater/README.md Test: TreeHugger Change-Id: I37570a8cfa0934a4772aecd0b28596e51d5cbf23
2022-06-28Upgrade rust/crates/combine to 4.6.4 am: 2cc9078f26 am: 60c273cb2a am: ↵David LeGare
8c290ee734 am: 3f40ec5730 am: a9526c95bb Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/combine/+/2137716 Change-Id: I53e541765e1d01b8c515e4daacec0a92ee54a53f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-28Upgrade rust/crates/combine to 4.6.4 am: 2cc9078f26 am: 60c273cb2a am: ↵David LeGare
8c290ee734 am: 3f40ec5730 Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/combine/+/2137716 Change-Id: I5080ead8ec5e20bc6a3e26997f8d90270a936bbb Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-28Upgrade rust/crates/combine to 4.6.4 am: 2cc9078f26 am: 60c273cb2a am: ↵David LeGare
8c290ee734 Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/combine/+/2137716 Change-Id: I9881cb9d4372129fac446cd406c8d453b06eb658 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-28Upgrade rust/crates/combine to 4.6.4 am: 2cc9078f26 am: 60c273cb2aDavid LeGare
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/combine/+/2137716 Change-Id: Id1b869c5c086470ea9c6d8b41bfc932761bd1c11 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-28Upgrade rust/crates/combine to 4.6.4 am: 2cc9078f26main-16kDavid LeGare
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/combine/+/2137716 Change-Id: Icf76db458da09fa42d27c58874bc03144267c5f7 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-28Upgrade rust/crates/combine to 4.6.4David LeGare
Test: make Change-Id: I5b07b26f650efc5753c957fe5d95071f46c0e4d1
2022-03-02Update combine to 4.6.3 am: 57dccb599c am: 461add3999 am: b46a4e59a5 am: ↵David LeGare
08c5e3ece3 am: c2d1005b71 Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/combine/+/2005930 Change-Id: Idb534b232c21bf004a44f75a6a5b4dd7be85e01c
2022-03-02Update combine to 4.6.3 am: 57dccb599c am: 461add3999 am: b46a4e59a5 am: ↵aml_wif_331910020aml_wif_331810010aml_wif_331710030aml_wif_331613000aml_wif_331511020aml_wif_331414000aml_wif_331310070aml_wif_331112000aml_wif_331016070aml_wif_330910030aml_wif_330810040aml_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_tet_331910040aml_tet_331820050aml_tet_331711040aml_tet_331511160aml_tet_331511000aml_tet_331412030aml_tet_331312080aml_tet_331117000aml_tet_331012080aml_tet_330911010aml_tet_330812150aml_swc_331911000aml_swc_331712000aml_swc_331612000aml_swc_331511000aml_swc_331410000aml_swc_331318000aml_swc_331116000aml_swc_331012020aml_sta_331910000aml_sta_331811000aml_sta_331711010aml_sta_331610000aml_sta_331511000aml_sta_331410000aml_sta_331311000aml_sta_331010010aml_sta_330910000aml_sdk_331812000aml_sdk_331811100aml_sdk_331811000aml_sdk_331412000aml_sdk_331410000aml_sdk_331310010aml_sdk_331111000aml_sdk_330810050aml_sdk_330810010aml_sch_331113000aml_sch_331111000aml_res_331820000aml_res_331611010aml_res_331512000aml_res_331314010aml_res_331114000aml_res_331011050aml_res_330910000aml_res_330810000aml_per_331913010aml_per_331812030aml_per_331710050aml_per_331611010aml_per_331512020aml_per_331411000aml_per_331313010aml_per_331115020aml_per_331019040aml_per_330912010aml_per_330811030aml_neu_331310000aml_neu_331113000aml_net_331910030aml_net_331812010aml_net_331710000aml_net_331610000aml_net_331412000aml_net_331313030aml_net_331313010aml_net_331110020aml_net_331011030aml_net_330910010aml_net_330811010aml_mpr_331918000aml_mpr_331812020aml_mpr_331711020aml_mpr_331613010aml_mpr_331512020aml_mpr_331412040aml_mpr_331311080aml_mpr_331112050aml_mpr_331112030aml_mpr_331011070aml_mpr_330911040aml_mpr_330811020aml_med_331911000aml_med_331712010aml_med_331612000aml_med_331511000aml_med_331410000aml_med_331318000aml_med_331115000aml_med_331012020aml_ips_331910010aml_ips_331312000aml_ips_331310000aml_ips_331111030aml_ips_331014020aml_ext_331814220aml_ext_331412000aml_ext_331312000aml_ext_331112010aml_ext_331012020aml_doc_331120000aml_con_331413000aml_con_331411000aml_con_331312000aml_con_331115000aml_con_331011010aml_cbr_331910000aml_cbr_331810000aml_cbr_331710020aml_cbr_331610010aml_cbr_331510000aml_cbr_331411000aml_cbr_331310010aml_cbr_331111030aml_cbr_331013010aml_cbr_330911010aml_cbr_330810000aml_ase_331311020aml_ase_331112000aml_ase_331011020aml_art_331813100aml_art_331813010aml_art_331711080aml_art_331612010aml_art_331413030aml_art_331314010aml_art_331113000aml_art_331012050aml_adb_331610000aml_adb_331314020aml_adb_331113120aml_adb_331011050aml_adb_331011040android13-mainline-wifi-releaseandroid13-mainline-uwb-releaseandroid13-mainline-tzdata4-releaseandroid13-mainline-tethering-releaseandroid13-mainline-sdkext-releaseandroid13-mainline-scheduling-releaseandroid13-mainline-resolv-releaseandroid13-mainline-permission-releaseandroid13-mainline-os-statsd-releaseandroid13-mainline-networking-releaseandroid13-mainline-mediaprovider-releaseandroid13-mainline-media-swcodec-releaseandroid13-mainline-media-releaseandroid13-mainline-ipsec-releaseandroid13-mainline-extservices-releaseandroid13-mainline-conscrypt-releaseandroid13-mainline-cellbroadcast-releaseandroid13-mainline-art-releaseandroid13-mainline-appsearch-releaseandroid13-mainline-adbd-releaseaml_tz4_332714010David LeGare
08c5e3ece3 Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/combine/+/2005930 Change-Id: Ie16431070d7a7279e5b9885f3c1e9aa10af0da20
2022-03-02Update combine to 4.6.3 am: 57dccb599c am: 461add3999 am: b46a4e59a5 am: ↵David LeGare
08c5e3ece3 Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/combine/+/2005930 Change-Id: I50dde4b34e032015b34f1ad89ac7dab1b11a8442
2022-03-02Update combine to 4.6.3 am: 57dccb599c am: 461add3999 am: b46a4e59a5t_frc_odp_330442040t_frc_odp_330442000t_frc_ase_330444010android-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_go_odp_330912000aml_go_ads_330915100aml_go_ads_330915000aml_go_ads_330913000android13-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-go-adservices-releaseandroid13-frc-odp-releaseandroid13-devandroid13-d4-s2-releaseandroid13-d4-s1-releaseandroid13-d4-releaseandroid13-d3-s1-releaseandroid13-d2-releaseDavid LeGare
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/combine/+/2005930 Change-Id: I34a632fef40423088cf00369ab2afff22fe151c4
2022-03-02Update combine to 4.6.3 am: 57dccb599c am: 461add3999David LeGare
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/combine/+/2005930 Change-Id: I6bde0077ef50892332460737987b507f67612763
2022-03-02Update combine to 4.6.3 am: 57dccb599cDavid LeGare
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/combine/+/2005930 Change-Id: I039023ce71b18ce4514cf14f418c03cbcb06c2ec
2022-03-01Update combine to 4.6.3David LeGare
Test: cd external/rust/crates && atest --host -c Change-Id: I1fc09eb4c836f821343ba88857e6b6e1b867ae33
2021-12-15Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING." am: e092e401eb ↵Joel Galenson
am: d7bbc3735b am: fc794a63cc am: a6e8b8492f Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/combine/+/1912621 Change-Id: I7e181585e75e74e1803f874bd4bdf30fb0344566
2021-12-15Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING." am: e092e401eb ↵Joel Galenson
am: d7bbc3735b am: fc794a63cc Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/combine/+/1912621 Change-Id: Id1031edbc88950df009cad5e663e6e343e919aee
2021-12-15Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING." am: e092e401eb ↵Joel Galenson
am: d7bbc3735b Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/combine/+/1912621 Change-Id: I1855398b29dcdf5daa31bf2b8a81fd761122f0c9
2021-12-15Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING." am: e092e401ebJoel Galenson
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/combine/+/1912621 Change-Id: Icac074761468751a1dc8e8005b1fbff4fe4ee77a
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: Ifc54d1bad7024f25b2813cc7b4da99c4c166fb44
2021-11-17[automerger skipped] Merge sc-qpr1-dev-plus-aosp-without-vendor@7810918 am: ↵Xin Li
a96cf09fd2 -s ours am: 28b6560dbf -s ours am: bca920ff70 -s ours am skip reason: Merged-In If77ab7c5e9ceee4f4fbbb29d49d7d156a643ebea with SHA-1 76e326df2b is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/rust/crates/combine/+/16278387 Change-Id: If8281e730a761b53b26d9a7fe7745603197c6b7c
2021-11-17[automerger skipped] Merge sc-qpr1-dev-plus-aosp-without-vendor@7810918 am: ↵Xin Li
a96cf09fd2 -s ours am: 28b6560dbf -s ours am skip reason: Merged-In If77ab7c5e9ceee4f4fbbb29d49d7d156a643ebea with SHA-1 76e326df2b is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/rust/crates/combine/+/16278387 Change-Id: Ibc744967904931925218894790674f0b8d7d619b
2021-11-17[automerger skipped] Merge sc-qpr1-dev-plus-aosp-without-vendor@7810918 am: ↵Xin Li
a96cf09fd2 -s ours am skip reason: Merged-In If77ab7c5e9ceee4f4fbbb29d49d7d156a643ebea with SHA-1 76e326df2b is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/rust/crates/combine/+/16278387 Change-Id: Ic2a6f983ec1dd02484114c839be2a00f7cf86039
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-28 04:54:11 +0000