aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2023-11-15Migrate to cargo_embargo. am: becc9dc0d0emu-34-3-releaseAndrew Walbran
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/rustc-hash/+/2832451 Change-Id: I2e3808c605020a2b15516f44e2718f2ab5893cbe Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-15Migrate to cargo_embargo.Andrew Walbran
Bug: 293289578 Test: Ran cargo_embargo, compared Android.bp Change-Id: Idbad587bd666e2ef19bbe394ae464a0e41cdf611
2023-03-09Make rustc-hash available to product and vendor am: 114597b8d4 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
bcc3cae7f2 am: 961bcde9fe am: 71d440f9fe Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/rustc-hash/+/2476245 Change-Id: I7ed610b828d2687bc8964779c34f24de87f460e0 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-09Make rustc-hash available to product and vendor am: 114597b8d4 am: ↵android14-devMatthew Maurer
bcc3cae7f2 am: 961bcde9fe Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/rustc-hash/+/2476245 Change-Id: Ibf28fac8c39ed183f6154adbeec5527bbfd1cf11 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-09Make rustc-hash available to product and vendor am: 114597b8d4 am: bcc3cae7f2emu-33-devMatthew Maurer
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/rustc-hash/+/2476245 Change-Id: Iecb7ead7ea17fee9a6d0c60a32dec55f0e2596b5 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-09Make rustc-hash available to product and vendor am: 114597b8d4android-u-beta-1-gplMatthew Maurer
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/rustc-hash/+/2476245 Change-Id: I4942282651359fd5f891db6c1c2c80a447776f17 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-07Make rustc-hash available to product and vendorMatthew Maurer
Bug: 270690570 Test: mma in external/rust/crates Change-Id: I838f73897637c0ef10410eb82d834c7dfb01a0de
2023-01-31Update TEST_MAPPING am: 8a30e286de am: d3eb006db6 am: d86598222bJeff Vander Stoep
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/rustc-hash/+/2411734 Change-Id: Ieaa43b71ea1ce95ec5197be79f0d3bb5abdffa56 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-31Update TEST_MAPPING am: 8a30e286de am: d3eb006db6Jeff Vander Stoep
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/rustc-hash/+/2411734 Change-Id: Ief1d86f4eac9642ad25010d1eb43548c8351ce47 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-31Update TEST_MAPPING am: 8a30e286deJeff Vander Stoep
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/rustc-hash/+/2411734 Change-Id: I671bfd593d580ed34dcded57ad1ffc29eb06698e 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: I50fe0ac5618d2c6eb16eebe3c041fefe8c044b19
2022-06-16Merge "Update TEST_MAPPING" am: d09089c402 am: fda4ae1691 am: b9e389d827 am: ↵Treehugger Robot
15c89bb590 am: 631762c3e7 Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/rustc-hash/+/2123476 Change-Id: I3432851e0baecd0064dbbf6c12d66d05e2ef3df0 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-15Merge "Update TEST_MAPPING" am: d09089c402 am: fda4ae1691 am: b9e389d827 am: ↵main-16k-with-phonesTreehugger Robot
15c89bb590 Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/rustc-hash/+/2123476 Change-Id: I3a21d0a501c77ada093aa614996ab5ceb70ac095 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-15Merge "Update TEST_MAPPING" am: d09089c402 am: fda4ae1691 am: b9e389d827Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/rustc-hash/+/2123476 Change-Id: I4b4412fd8bb2d6839e8355019180f5ab70e3f40e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-15Merge "Update TEST_MAPPING" am: d09089c402 am: fda4ae1691Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/rustc-hash/+/2123476 Change-Id: Ib1d65cb07cf4517d96e8e5b7a6167ee642a6148a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-15Merge "Update TEST_MAPPING" am: d09089c402Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/rustc-hash/+/2123476 Change-Id: Ie3d87c6d7c98a5b86069034b1af4cfe7fff727ad 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: Ief1e206e76ce87f875505428bd9950bb587ab99c
2022-05-31Update TEST_MAPPING am: e9c5226f5a am: 3ffacaa5f3 am: ff14c6f91a am: ↵Matthew Maurer
14ad17adfa am: cb3bd24f80 Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/rustc-hash/+/2108503 Change-Id: I307d5c60c12be956aeafdd0811e121c03a79f9ed Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-31Update TEST_MAPPING am: e9c5226f5a am: 3ffacaa5f3 am: ff14c6f91a am: 14ad17adfaMatthew Maurer
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/rustc-hash/+/2108503 Change-Id: I388311c2d23c43eb62dc739c6581482b1b7a9fc7 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-31Update TEST_MAPPING am: e9c5226f5a am: 3ffacaa5f3 am: ff14c6f91aMatthew Maurer
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/rustc-hash/+/2108503 Change-Id: Ifd0c6b9a6f6c09776120f2f793e91a7dc79d13a6 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-31Update TEST_MAPPING am: e9c5226f5a am: 3ffacaa5f3Matthew Maurer
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/rustc-hash/+/2108503 Change-Id: Ia1384b2236537116df0a6c35e849ada8ca94e6a3 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-31Update TEST_MAPPING am: e9c5226f5aMatthew Maurer
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/rustc-hash/+/2108503 Change-Id: I8ddc8223fa2732ae99198cf983443df44795708f 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: Ia1ff03356eaf73f681b1b370ada750bd7328e399
2021-12-15Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING." am: d1fefa5863 ↵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: d9c5d7bd1f am: 024cc81079 am: e59a57f81a Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/rustc-hash/+/1912684 Change-Id: I69251ba32bd7012918f2ef37f71ecf611d6b04e3
2021-12-15Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING." am: d1fefa5863 ↵Joel Galenson
am: d9c5d7bd1f am: 024cc81079 Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/rustc-hash/+/1912684 Change-Id: I9e0efe195aabf5632baefe0395193f509648a897
2021-12-15Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING." am: d1fefa5863 ↵Joel Galenson
am: d9c5d7bd1f Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/rustc-hash/+/1912684 Change-Id: Ifa313948896fae465e857df148371354a3d3d9e2
2021-12-15Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING." am: d1fefa5863Joel Galenson
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/rustc-hash/+/1912684 Change-Id: I481e02dfa3a911f52e1d98a2de70faa1e05cfbe3
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: Ifedf4e03b13223708457cf71059c5949b294ec42
2021-08-30Update TEST_MAPPING am: 2126573e27 am: 50d4598f29 am: 702b38976f am: ↵Joel Galenson
b27d6cf563 am: 64e3a8ee68 Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/rustc-hash/+/1813976 Change-Id: Icd38998e006e1d1db2352c807def147586e96987
2021-08-30Update TEST_MAPPING am: 2126573e27 am: 50d4598f29 am: 702b38976f am: b27d6cf563Joel Galenson
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/rustc-hash/+/1813976 Change-Id: I6974b59f64765eeaa889c05429e856df53c330f5
2021-08-30Update TEST_MAPPING am: 2126573e27 am: 50d4598f29 am: 702b38976fJoel Galenson
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/rustc-hash/+/1813976 Change-Id: I90cb17b40b5be62b501e02a72ad5b023a1963502
2021-08-30Update TEST_MAPPING am: 2126573e27 am: 50d4598f29Joel Galenson
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/rustc-hash/+/1813976 Change-Id: I8cbc174afd50fd9518e9250178efdfc988077576
2021-08-30Update TEST_MAPPING am: 2126573e27android-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/rustc-hash/+/1813976 Change-Id: I4e1457b6a01fe049cab1dbd80ec8ba5a02118b8a
2021-08-30Update TEST_MAPPINGandroid-s-beta-5android-s-beta-5Joel Galenson
Test: None Change-Id: Ia553fc789b72bea804abf83813452c6323d7d2d2
2021-08-24Update TEST_MAPPING am: fb5c1c6838 am: b236b91cd7 am: cf12f9ae38 am: ↵Joel Galenson
9faeaee1d6 am: 522dfe455b Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/rustc-hash/+/1806102 Change-Id: I99c8cbf8e64600b348be5a3a027434a24d592265
2021-08-24Update TEST_MAPPING am: fb5c1c6838 am: b236b91cd7 am: cf12f9ae38 am: 9faeaee1d6Joel Galenson
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/rustc-hash/+/1806102 Change-Id: I5a7f53f10b1907156a2787039b3d1cbb61b7f4f7
2021-08-24Update TEST_MAPPING am: fb5c1c6838 am: b236b91cd7 am: cf12f9ae38Joel Galenson
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/rustc-hash/+/1806102 Change-Id: Icebf8ee0ff48a767ade3df4b3d7bd89ea74f4815
2021-08-24Update TEST_MAPPING am: fb5c1c6838 am: b236b91cd7Joel Galenson
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/rustc-hash/+/1806102 Change-Id: Ib93bb6d5a1f6f36bf8cbdf8495eac9e04dc2e246
2021-08-24Update TEST_MAPPING am: fb5c1c6838Joel Galenson
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/rustc-hash/+/1806102 Change-Id: Ic393adbf921e34ecf0416c33f07d61d9aa253751
2021-08-23Update TEST_MAPPINGJoel Galenson
Test: None Change-Id: I0763f39fea54e187256774d9605192daca563102
2021-06-02Merge sc-mainline-prodXin Li
Bug: 189946434 Change-Id: If0fc552d95b709d1688a6952a9d89aba72888dba
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 121787916b -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: a5007f8908 -s ours am: 2954af9095 -s ours am skip reason: Change-Id If6a82508ddf9a5bf758c5956fbd8ebe92b0c4eaf with SHA-1 7222747d6e is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I81f9507bc3aa49f5c4c285190a85f52b2693cd5a
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 121787916b -s ↵Xin Li
ours am: a5007f8908 -s ours am: 2954af9095 -s ours am skip reason: Change-Id If6a82508ddf9a5bf758c5956fbd8ebe92b0c4eaf with SHA-1 7222747d6e is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I0e8a9e50d055f0bdbbf149f17ebef2b753a0abdb
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 121787916b -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: a5007f8908 -s ours am skip reason: Change-Id If6a82508ddf9a5bf758c5956fbd8ebe92b0c4eaf with SHA-1 7222747d6e is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I8980294a7741b1a5b71913a236f9406305a75f32
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 121787916b -s oursXin Li
am skip reason: Change-Id If6a82508ddf9a5bf758c5956fbd8ebe92b0c4eaf with SHA-1 7222747d6e is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ie6ec13e2e9497e35cf7299d7160ed446e4f73918
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: If6a82508ddf9a5bf758c5956fbd8ebe92b0c4eaf Change-Id: Ia893e09aed497e5dc374b9b8022f9c97eecb351d
2021-02-16[LSC] Add LOCAL_LICENSE_KINDS to external/rust/crates/rustc-hash am: ↵Bob Badour
5f5d8f269f am: 73ffca8559 am: 56d4e9acc4 am: 2b7e362009 Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/rustc-hash/+/1588717 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I3c0426c79faba236ef9c6d60861a59d997f9a39a
2021-02-16[LSC] Add LOCAL_LICENSE_KINDS to external/rust/crates/rustc-hash am: ↵Bob Badour
5f5d8f269f am: 73ffca8559 am: 56d4e9acc4 am: 2b7e362009 Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/rustc-hash/+/1588717 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I160a082a06a2a7ada1b4f0272c17ed72bfdbabc1