summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2023-11-15Migrate to cargo_embargo. am: d4cc133005HEADmastermainemu-35-1-releaseemu-34-3-releaseemu-34-2-releaseemu-34-2-devAndrew Walbran
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/proc-macro-error-attr/+/2830450 Change-Id: Iccd7852d0c430c3991b2e3ec28c5bd0c3846d0fe Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-14Migrate to cargo_embargo.Andrew Walbran
Bug: 293289578 Test: Ran cargo_embargo, compared Android.bp Change-Id: I06dc583eea4df2fe00d6bee90c3e21e6f18ac16d
2023-11-09Merge "Adding autogenerated Trusty makefile rules" into main am: b4ebfdae99Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/proc-macro-error-attr/+/2753348 Change-Id: I904a2098e15e17c93d3ddc7c454d43bb4f994bc0 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-09Merge "Adding autogenerated Trusty makefile rules" into mainTreehugger Robot
2023-10-11Merge "Update Android.bp to reflect aosp/2763825" into main am: 4142446b3c ↵James Farrell
am: 8b09146a22 am: 20b4e3232b am: d13bd932b2 Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/proc-macro-error-attr/+/2774995 Change-Id: I9205b25b4a99508a80a0bdd26568eb8d005946af Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-11Merge "Update Android.bp to reflect aosp/2763825" into main am: 4142446b3c ↵James Farrell
am: 8b09146a22 am: 20b4e3232b Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/proc-macro-error-attr/+/2774995 Change-Id: I1f0ab4bd14f19fc221774c539f7cc3e334d1afde Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-11Merge "Update Android.bp to reflect aosp/2763825" into main am: 4142446b3c ↵James Farrell
am: 8b09146a22 Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/proc-macro-error-attr/+/2774995 Change-Id: Ice97254ac5549d5c01907020f62c3236948d0f6f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-11Merge "Update Android.bp to reflect aosp/2763825" into main am: 4142446b3cJames Farrell
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/proc-macro-error-attr/+/2774995 Change-Id: I357ef107963432d71e6b445545d7b58539281864 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-11Merge "Update Android.bp to reflect aosp/2763825" into mainJames Farrell
2023-10-05Update Android.bp to reflect aosp/2763825James Farrell
Test: Ran cargo2android. Treehugger. Change-Id: I477737abbcdff5b5e9e4ea4edd4982655fe35601
2023-09-14Adding autogenerated Trusty makefile rulesPer Larsen
Bug: 281857510 Change-Id: Ie05f89582003bbbbe32403fa380db3b6dcc560df
2023-03-09Make proc-macro-error-attr available to product and vendor am: e720490b44 ↵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: ee061705d4 am: 1fdea0dd71 am: 9a7622aa52 Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/proc-macro-error-attr/+/2476392 Change-Id: Iaa296dadb0bad22373b9a06ab3490b9b56d6175f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-09Make proc-macro-error-attr available to product and vendor am: e720490b44 ↵android14-devMatthew Maurer
am: ee061705d4 am: 1fdea0dd71 Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/proc-macro-error-attr/+/2476392 Change-Id: I06b0640634a0878bcd9d7ac4d000486fd99bac24 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-09Make proc-macro-error-attr available to product and vendor am: e720490b44 ↵emu-33-devMatthew Maurer
am: ee061705d4 Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/proc-macro-error-attr/+/2476392 Change-Id: Ic0a163b0914d0acb2619233a5f36d6334685898d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-09Make proc-macro-error-attr available to product and vendor am: e720490b44android-u-beta-1-gplMatthew Maurer
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/proc-macro-error-attr/+/2476392 Change-Id: Ic7b5411d36bf894e28bddcf69afe55deb85880a3 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-07Make proc-macro-error-attr available to product and vendorMatthew Maurer
Bug: 270690570 Test: mma in external/rust/crates Change-Id: Id03bed68ffa7cf9614156dd2a956c636118a9142
2023-01-31Update TEST_MAPPING am: eb05710f1a am: c7bcc19d8e am: 3b28dd919cJeff Vander Stoep
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/proc-macro-error-attr/+/2411616 Change-Id: Ic2453fc78073a3794b9b9021ba93105f6e560a94 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-31Update TEST_MAPPING am: eb05710f1a am: c7bcc19d8eJeff Vander Stoep
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/proc-macro-error-attr/+/2411616 Change-Id: Id1cbfc5c51519c04a1cc155b37f5ed43493c852d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-31Update TEST_MAPPING am: eb05710f1aJeff Vander Stoep
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/proc-macro-error-attr/+/2411616 Change-Id: Id430140dc13d7e7e5c02dccee5e8b842c7eff4d8 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: Id58a71e8f9bcafa9dc4d01b510768ef0368035fc
2022-06-16Merge "Update TEST_MAPPING" am: 64b416f8a6 am: 36a565287c am: c47e6359de am: ↵Treehugger Robot
9f9cbb30da am: 628df384c7 Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/proc-macro-error-attr/+/2126001 Change-Id: I5795794831c150d68b131b86359d49ac8808f4c3 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-15Merge "Update TEST_MAPPING" am: 64b416f8a6 am: 36a565287c am: c47e6359de am: ↵main-16k-with-phonesTreehugger Robot
9f9cbb30da Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/proc-macro-error-attr/+/2126001 Change-Id: I57f6895360c83b62e4db7f7064c7f1d6881ace87 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-15Merge "Update TEST_MAPPING" am: 64b416f8a6 am: 36a565287c am: c47e6359deTreehugger Robot
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/proc-macro-error-attr/+/2126001 Change-Id: I5746a908668a6153e038e521f2312325b60c6d24 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-15Merge "Update TEST_MAPPING" am: 64b416f8a6 am: 36a565287cmain-16kTreehugger Robot
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/proc-macro-error-attr/+/2126001 Change-Id: I1cda837ee73a6f386755a718f4b68606971cd243 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-15Merge "Update TEST_MAPPING" am: 64b416f8a6Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/proc-macro-error-attr/+/2126001 Change-Id: I3cbbfa950cf7204c971dc49459d61b0793ccddf2 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: I6478ac0d8d084aacfc81923c85d6cbb6c18a72c7
2022-05-31Update TEST_MAPPING am: 16befe9303 am: fd7d7eac77 am: 403118b983 am: ↵Matthew Maurer
f761aaa1d9 am: f6845d10a8 Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/proc-macro-error-attr/+/2107127 Change-Id: I7b3f679334b141197eeae4737d5dd56941681c01 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-31Update TEST_MAPPING am: 16befe9303 am: fd7d7eac77 am: 403118b983 am: f761aaa1d9Matthew Maurer
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/proc-macro-error-attr/+/2107127 Change-Id: I952e424ec3cbfe6e8248e59a1f68e4f872b8b5f8 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-31Update TEST_MAPPING am: 16befe9303 am: fd7d7eac77 am: 403118b983Matthew Maurer
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/proc-macro-error-attr/+/2107127 Change-Id: Ie97b315debf08e9bfe5e8e70884d707e1b1dec62 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-31Update TEST_MAPPING am: 16befe9303 am: fd7d7eac77Matthew Maurer
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/proc-macro-error-attr/+/2107127 Change-Id: Iff061ce8298d2fa08304cea79fc91c2e0cb1e09b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-31Update TEST_MAPPING am: 16befe9303Matthew Maurer
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/proc-macro-error-attr/+/2107127 Change-Id: Iea70e748eb0f495b6fa9fab852fcf155ef78af16 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: Ib46bbb8fb237cd57dd3c57a9394c9c546e435822
2021-12-15Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING." am: 4d183ff2a6 ↵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: 7e589d6583 am: ac359e0e56 am: 46a0cad69d Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/proc-macro-error-attr/+/1912657 Change-Id: If62124b99ed2945af36b8aa76a7d46b3bbe34e16
2021-12-15Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING." am: 4d183ff2a6 ↵Joel Galenson
am: 7e589d6583 am: ac359e0e56 Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/proc-macro-error-attr/+/1912657 Change-Id: I08e7e5bd2f0e1479f90c72601bd885d9cbc163e4
2021-12-15Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING." am: 4d183ff2a6 ↵Joel Galenson
am: 7e589d6583 Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/proc-macro-error-attr/+/1912657 Change-Id: Id41697f504580853e9307b2198e595cfa48887e5
2021-12-15Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING." am: 4d183ff2a6Joel Galenson
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/proc-macro-error-attr/+/1912657 Change-Id: Ia44652fabca74701d6a6de8e60ae5e3d1ae6dd69
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: Icb91b0d9e73c352c4d970f2c60f836b75e33492d
2021-08-30Update TEST_MAPPING am: a6022ffbb3 am: 3db695ae64 am: dc41fd57ef am: ↵Joel Galenson
7d3dfd4cd0 am: 7ba5023327 Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/proc-macro-error-attr/+/1813859 Change-Id: I62847027c8bcd7df8d094d3845f7997119b0f91c
2021-08-30Update TEST_MAPPING am: a6022ffbb3 am: 3db695ae64 am: dc41fd57ef am: 7d3dfd4cd0Joel Galenson
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/proc-macro-error-attr/+/1813859 Change-Id: I9554b7322e449f5a447bcc6a36c94d65ed32a52b
2021-08-30Update TEST_MAPPING am: a6022ffbb3 am: 3db695ae64 am: dc41fd57efJoel Galenson
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/proc-macro-error-attr/+/1813859 Change-Id: Idaa208407c4aa7249baa5dfc83891040609c7ec9
2021-08-30Update TEST_MAPPING am: a6022ffbb3 am: 3db695ae64Joel Galenson
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/proc-macro-error-attr/+/1813859 Change-Id: I67541438153edaf4f138619d2f8ced42627a1dac
2021-08-30Update TEST_MAPPING am: a6022ffbb3android-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-attr/+/1813859 Change-Id: I84233310765cb61ae3ad7d42ebb8c33d0afd6824
2021-08-30Update TEST_MAPPINGandroid-s-beta-5android-s-beta-5Joel Galenson
Test: None Change-Id: I22ca3d62d769997e8510ef1b310674d76e9f8a4f
2021-06-02Merge sc-mainline-prodXin Li
Bug: 189946434 Change-Id: I856a9ef88e6527876edc0847b5d4e9e00e6843aa
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 18b6038e1e -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: 3c4c7a4f5a -s ours am: 0b5e7a8ad1 -s ours am skip reason: Change-Id I3b7b35ce962378c5d7ae0776922b1a36cdad1d67 with SHA-1 4705e1173e is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I81ec76282609beb654a05c780710c41b59a578d2
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 18b6038e1e -s ↵Xin Li
ours am: 3c4c7a4f5a -s ours am: 0b5e7a8ad1 -s ours am skip reason: Change-Id I3b7b35ce962378c5d7ae0776922b1a36cdad1d67 with SHA-1 4705e1173e is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I0ae1eacbe3928988333ac6de1de999c43f5efc44
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 18b6038e1e -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: 3c4c7a4f5a -s ours am skip reason: Change-Id I3b7b35ce962378c5d7ae0776922b1a36cdad1d67 with SHA-1 4705e1173e is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ib7fc4f680964eaae6ea9525519308a0beafd7a2e
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 18b6038e1e -s oursXin Li
am skip reason: Change-Id I3b7b35ce962378c5d7ae0776922b1a36cdad1d67 with SHA-1 4705e1173e is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I8fd0fc7daadd2516595411268bcfab05cd6666de
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-10 23:50:13 +0000