aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2023-03-09Make proc-macro-error available to product and vendor am: cdec10381f 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-releaseMatthew Maurer
c022b640ee am: d180d01735 am: 1e34a9b7a3 Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/proc-macro-error/+/2476453 Change-Id: Ib713abbb23b800fc33d0691d31167eb96f145e4f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-09Make proc-macro-error available to product and vendor am: cdec10381f am: ↵android14-devMatthew Maurer
c022b640ee am: d180d01735 Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/proc-macro-error/+/2476453 Change-Id: Ifa0d5642fef73a0e7fa3e4dfd5e5cae2502f2588 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-09Make proc-macro-error available to product and vendor am: cdec10381f am: ↵emu-33-devMatthew Maurer
c022b640ee Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/proc-macro-error/+/2476453 Change-Id: Ib925e7c4658e45d960a98d6074c3155a1f2f25a1 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-09Make proc-macro-error available to product and vendor am: cdec10381fandroid-u-beta-1-gplMatthew Maurer
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/proc-macro-error/+/2476453 Change-Id: I4f7c82e5d182f7ea7db4e651ed1ec8cd16693c6e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-07Make proc-macro-error available to product and vendorMatthew Maurer
Bug: 270690570 Test: mma in external/rust/crates Change-Id: Ie03f5e73ec09c449e7570c65ff1334dd7cb6328c
2023-01-31Update TEST_MAPPING am: 7f45d92429 am: a54051d356 am: f9dee1f007Jeff Vander Stoep
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/proc-macro-error/+/2411719 Change-Id: Ic6e480d259cb7b50abad0404ee7c9124028a94b4 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-31Update TEST_MAPPING am: 7f45d92429 am: a54051d356Jeff Vander Stoep
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/proc-macro-error/+/2411719 Change-Id: Ia628f51d694fb25c064f67e9d7734c128cd2da07 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-31Update TEST_MAPPING am: 7f45d92429Jeff Vander Stoep
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/proc-macro-error/+/2411719 Change-Id: I241235c20d95b1f9ef1ca094212954242fac3d49 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-30Update TEST_MAPPINGJeff Vander Stoep
Test: atest Change-Id: Iafc68b75eeeb68180dd8a41b477b3f1ec281ce6a
2022-06-16Merge "Update TEST_MAPPING" am: 15f82648c7 am: 801447a87f am: dc1696b873 am: ↵Treehugger Robot
b00429ff74 am: 77b745f9bc Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/proc-macro-error/+/2126152 Change-Id: I9f7a888c45ee5d1c07e12cf959efcc89cf5ea907 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-15Merge "Update TEST_MAPPING" am: 15f82648c7 am: 801447a87f am: dc1696b873 am: ↵main-16k-with-phonesTreehugger Robot
b00429ff74 Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/proc-macro-error/+/2126152 Change-Id: I6d9c497e88ecae271f48106c508a7008a3e927b0 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-15Merge "Update TEST_MAPPING" am: 15f82648c7 am: 801447a87f am: dc1696b873Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/proc-macro-error/+/2126152 Change-Id: I1a728a9c0af886eec9efd3a569aed6cffb0ab281 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-15Merge "Update TEST_MAPPING" am: 15f82648c7 am: 801447a87fmain-16kTreehugger Robot
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/proc-macro-error/+/2126152 Change-Id: Id23d8692b46a6cf6677559c23ee4a26e14309cca Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-15Merge "Update TEST_MAPPING" am: 15f82648c7Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/proc-macro-error/+/2126152 Change-Id: I7749d99be5443b3559c8dfed26ba0a60f5c4c23b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-15Merge "Update TEST_MAPPING"Treehugger Robot
2022-06-14Update TEST_MAPPINGMatthew Maurer
Test: None Bug: 236006683 Change-Id: I165d585274b966bde9227ce44df724b323bb2dc3
2022-05-31Update TEST_MAPPING am: 2b52271424 am: b2813832a9 am: 5d26cdcd2b am: ↵Matthew Maurer
2a388d675c am: a72add6481 Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/proc-macro-error/+/2108499 Change-Id: If427776c5fcfc62944effbc94d958eab9a8a2b55 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-31Update TEST_MAPPING am: 2b52271424 am: b2813832a9 am: 5d26cdcd2b am: 2a388d675cMatthew Maurer
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/proc-macro-error/+/2108499 Change-Id: I85018929baebdbd72697dc7057e335c1acac4988 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-31Update TEST_MAPPING am: 2b52271424 am: b2813832a9 am: 5d26cdcd2bMatthew Maurer
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/proc-macro-error/+/2108499 Change-Id: I352e793593c386401f700b69844ccb981b0cc472 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-31Update TEST_MAPPING am: 2b52271424 am: b2813832a9Matthew Maurer
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/proc-macro-error/+/2108499 Change-Id: I02379b957e03c34942ec0f22563041e4741fd677 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-31Update TEST_MAPPING am: 2b52271424Matthew Maurer
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/proc-macro-error/+/2108499 Change-Id: Ife3f64991f67ec185ef2fda9af5733345dc71af0 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-26Update TEST_MAPPINGMatthew Maurer
Test: None Bug: 233924440 Change-Id: I95bc2d3dfa61397229751c584912b5b49ea9eacb
2021-12-15Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING." am: f0c1367f39 ↵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_332714010Joel Galenson
am: 506164c0f5 am: ab6620d24c am: 7ae34e1bc9 Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/proc-macro-error/+/1912530 Change-Id: I439dd5cb4554fdbc58d9d485cfec00ce56056cfe
2021-12-15Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING." am: f0c1367f39 ↵Joel Galenson
am: 506164c0f5 am: ab6620d24c Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/proc-macro-error/+/1912530 Change-Id: Ic45fe08f5be6f80a9578295e65ed0edc91e80e84
2021-12-15Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING." am: f0c1367f39 ↵Joel Galenson
am: 506164c0f5 Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/proc-macro-error/+/1912530 Change-Id: Ic1e815fa27eab9ff58e8c632ce6edba4a0bd6b94
2021-12-15Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING." am: f0c1367f39Joel Galenson
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/proc-macro-error/+/1912530 Change-Id: I399764a01bb9d7a3c6d361df088aca2efd6cf366
2021-12-15Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING."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-1Joel Galenson
2021-12-10Refresh Android.bp, cargo2android.json, TEST_MAPPING.Joel Galenson
Test: None Change-Id: I63ab487a0de3003e5685325e5bcaf4376b97dbd9
2021-08-30Update TEST_MAPPING am: 9c009c96d4 am: 7f6c0fead3 am: 4c45a21e11 am: ↵Joel Galenson
03a16cad45 am: 736a969b60 Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/proc-macro-error/+/1813887 Change-Id: Ia7f5ed96edf210415cc4c7a6e14198e9609f9fea
2021-08-30Update TEST_MAPPING am: 9c009c96d4 am: 7f6c0fead3 am: 4c45a21e11 am: 03a16cad45Joel Galenson
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/proc-macro-error/+/1813887 Change-Id: I248bde09a13111bff2c1b1941e0cbc06fa77fcf1
2021-08-30Update TEST_MAPPING am: 9c009c96d4 am: 7f6c0fead3 am: 4c45a21e11Joel Galenson
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/proc-macro-error/+/1813887 Change-Id: I0f763a05535333fb1657d4e2ff60934b8c6f537f
2021-08-30Update TEST_MAPPING am: 9c009c96d4 am: 7f6c0fead3Joel Galenson
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/proc-macro-error/+/1813887 Change-Id: I9fef413e5f5aab859aebcaef7f08e3c133277460
2021-08-30Update TEST_MAPPING am: 9c009c96d4android-s-v2-preview-2android-s-v2-preview-1android-s-v2-beta-2android-s-v2-preview-1Joel Galenson
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/proc-macro-error/+/1813887 Change-Id: Ia76aa810ce65d07d88838e3b3c0b523980ea1c6c
2021-08-30Update TEST_MAPPINGandroid-s-beta-5android-s-beta-5Joel Galenson
Test: None Change-Id: Ie1e5994f832b04d828406e17f1ae9b1b5b8765cf
2021-06-02Merge sc-mainline-prodXin Li
Bug: 189946434 Change-Id: I4f1df3fcad196f3edd65e77ceca510bbe47bf29d
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 39743039e2 -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: bb50d20ec9 -s ours am: 966f368b96 -s ours am skip reason: Change-Id I9f18d531cd62e1137ca164e076fc040daec323ca with SHA-1 cd2ce0a2e0 is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: If5a33d9be46e18f3037e7dc67531e44abd6337d5
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 39743039e2 -s ↵Xin Li
ours am: bb50d20ec9 -s ours am: 966f368b96 -s ours am skip reason: Change-Id I9f18d531cd62e1137ca164e076fc040daec323ca with SHA-1 cd2ce0a2e0 is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I4963e78b83a372adb0f036461741ab9a15b4c8b2
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 39743039e2 -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: bb50d20ec9 -s ours am skip reason: Change-Id I9f18d531cd62e1137ca164e076fc040daec323ca with SHA-1 cd2ce0a2e0 is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Iae13a5ac84190ae57ba89592f9d4922eb5e8017b
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 39743039e2 -s oursXin Li
am skip reason: Change-Id I9f18d531cd62e1137ca164e076fc040daec323ca with SHA-1 cd2ce0a2e0 is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I67b396a593e85fe0b35ccbc6b41fba0ffce57630
2021-02-20Mark ab/7061308 as merged in stage.android-s-beta-4android-s-beta-3android-s-beta-2android-s-beta-1android-s-beta-4Xin Li
Bug: 180401296 Merged-In: I9f18d531cd62e1137ca164e076fc040daec323ca Change-Id: I105569b5009e1b1941e52a9bf592e2bd23aca221
2021-02-17[LSC] Add LOCAL_LICENSE_KINDS to external/rust/crates/proc-macro-error am: ↵Bob Badour
ee71df73ff am: 486c1e900c am: a352750152 am: 609f437871 Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/proc-macro-error/+/1587407 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I1c867ec5bcd3cb83fa3f736bca8411b171618afc
2021-02-17[LSC] Add LOCAL_LICENSE_KINDS to external/rust/crates/proc-macro-error am: ↵Bob Badour
ee71df73ff am: 486c1e900c am: a352750152 am: 609f437871 Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/proc-macro-error/+/1587407 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I6b5f2e078d81d85ff2850e02ed82c57d39e4db91
2021-02-17[LSC] Add LOCAL_LICENSE_KINDS to external/rust/crates/proc-macro-error am: ↵Bob Badour
ee71df73ff am: 486c1e900c am: a352750152 Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/proc-macro-error/+/1587407 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ia62b037f969a736896cf9a7cfa71d66fd18633a7
2021-02-17[LSC] Add LOCAL_LICENSE_KINDS to external/rust/crates/proc-macro-error am: ↵Bob Badour
ee71df73ff am: 486c1e900c Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/proc-macro-error/+/1587407 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Idfa3a9a79db81ed76bd4bd376fef2a02791cef55
2021-02-17[LSC] Add LOCAL_LICENSE_KINDS to external/rust/crates/proc-macro-error am: ↵Bob Badour
ee71df73ff Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/proc-macro-error/+/1587407 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Id49faeb500d43fa8f1dd004b43d783b83a5c0d4c
2021-02-16[LSC] Add LOCAL_LICENSE_KINDS to external/rust/crates/proc-macro-errorandroid-s-preview-1Bob Badour
Added SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-MIT to: Android.bp Bug: 68860345 Bug: 151177513 Bug: 151953481 Test: m all Exempt-From-Owner-Approval: janitorial work Change-Id: I7892339a7ff19b411787fa2407f59ff209fe7662
2021-02-17Clean up rust_test_host TEST_MAPPING after default update am: f706f8b82f am: ↵Julien Desprez
1463bab310 am: 0031ebf36b am: d6239fd988 Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/proc-macro-error/+/1590595 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ie88e7075fac99d13267e3b86a803805ccbd8ea5a
2021-02-17Clean up rust_test_host TEST_MAPPING after default update am: f706f8b82f am: ↵Julien Desprez
1463bab310 am: 0031ebf36b am: d6239fd988 Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/proc-macro-error/+/1590595 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Icc908aa57b8fb17ee32e10f8cf608f93557e0b28
2021-02-16Clean up rust_test_host TEST_MAPPING after default update am: f706f8b82f am: ↵Julien Desprez
1463bab310 am: 0031ebf36b Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/proc-macro-error/+/1590595 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Icea7721c1583123a31e4e7de0fec0c0e43cfadb6
2021-02-16Clean up rust_test_host TEST_MAPPING after default update am: f706f8b82f am: ↵Julien Desprez
1463bab310 Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/proc-macro-error/+/1590595 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I327048f99f2c317a4256b41a16722d0188ba0ad9
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-28 22:48:25 +0000