aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2023-10-18Migrate to cargo_embargo. am: 3e1c42f469emu-34-3-releaseAndrew Walbran
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/fnv/+/2796414 Change-Id: I0a322a1cc3fb6257e87f624364f93fe200b1ec0d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-18Migrate to cargo_embargo.Andrew Walbran
Bug: 293289578 Test: Ran cargo_embargo, compared Android.bp Change-Id: I6ccc76d4a27bad8389c7b82dc55c8a0e306a15a1
2023-03-09Make fnv available to product and vendor am: 24b05cb4ad am: 1f4830fdbf 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
7bc4e2b7a1 am: c9ebf3f0d2 Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/fnv/+/2476405 Change-Id: I6fd3824af544188f5471ca1fb72059e469726268 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-09Make fnv available to product and vendor am: 24b05cb4ad am: 1f4830fdbf am: ↵android14-devMatthew Maurer
7bc4e2b7a1 Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/fnv/+/2476405 Change-Id: I481e9b34f3b3723c113439a8b41fdb7a26f4e467 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-09Make fnv available to product and vendor am: 24b05cb4ad am: 1f4830fdbfemu-33-releaseemu-33-devMatthew Maurer
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/fnv/+/2476405 Change-Id: Ifa4bc231151ef445d2e8996a8cc9873565a87448 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-09Make fnv available to product and vendor am: 24b05cb4adandroid-u-beta-1-gplMatthew Maurer
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/fnv/+/2476405 Change-Id: I21c02d1d0edb078225584af3608ea2dc45c2f0e6 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-07Make fnv available to product and vendorMatthew Maurer
Bug: 270690570 Test: mma in external/rust/crates Change-Id: I9fd88fe14d05042e89dcaa83278602e61ca9f88d
2023-01-31Update TEST_MAPPING am: 8f9bf87bab am: 176979e43e am: f830aa8f0bJeff Vander Stoep
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/fnv/+/2411775 Change-Id: I3accfffc84ac4283b7c172b9b6488842938f930b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-31Update TEST_MAPPING am: 8f9bf87bab am: 176979e43eJeff Vander Stoep
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/fnv/+/2411775 Change-Id: Ifb4adcc0087b3d4d6b49b8b0dd50f5ba10f184be Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-31Update TEST_MAPPING am: 8f9bf87babJeff Vander Stoep
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/fnv/+/2411775 Change-Id: Icb920e7a9f93a021bb918b5423430f37ec81414a 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: Idb12dc54af702f09d07c7bcb748352d701efb9c8
2022-06-16Merge "Update TEST_MAPPING" am: 5b064ca2d7 am: a6c7a3b74e am: 60935580d7 am: ↵Treehugger Robot
07a24b0a1e am: ac1cec0b30 Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/fnv/+/2125837 Change-Id: I6e93d3b000203cd442436d6a53ccf84707ab9afd Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-15Merge "Update TEST_MAPPING" am: 5b064ca2d7 am: a6c7a3b74e am: 60935580d7 am: ↵main-16k-with-phonesTreehugger Robot
07a24b0a1e Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/fnv/+/2125837 Change-Id: Ia8982f96e712429eb6c72e977c43d45b628b7aec Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-15Merge "Update TEST_MAPPING" am: 5b064ca2d7 am: a6c7a3b74e am: 60935580d7Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/fnv/+/2125837 Change-Id: Iccbf24c24876374ffa26ef668e8ef2551e913112 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-15Merge "Update TEST_MAPPING" am: 5b064ca2d7 am: a6c7a3b74emain-16kTreehugger Robot
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/fnv/+/2125837 Change-Id: Iba3076d529d4146c1821461281653cb0c3491c8e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-15Merge "Update TEST_MAPPING" am: 5b064ca2d7Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/fnv/+/2125837 Change-Id: I17bbd4f97fbfc921c6db16b66ec837580f16817e 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: I7d79a3025abf4376cb66916bc4be0bb109a5d71f
2022-05-31Update TEST_MAPPING am: 8772aab4b8 am: a8c01c923d am: 3f253e44ef am: ↵Matthew Maurer
2a45d02744 am: 3e32e53d30 Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/fnv/+/2108487 Change-Id: I73d9b9f60d3e432034f1b75ff76d0dc96447a9c2 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-31Update TEST_MAPPING am: 8772aab4b8 am: a8c01c923d am: 3f253e44ef am: 2a45d02744Matthew Maurer
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/fnv/+/2108487 Change-Id: I15a5d3564bb5d03650b255bc0d1c21a91609ccf1 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-31Update TEST_MAPPING am: 8772aab4b8 am: a8c01c923d am: 3f253e44efMatthew Maurer
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/fnv/+/2108487 Change-Id: I25482d09bba7afc17b97d11dcbabe64646b11911 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-31Update TEST_MAPPING am: 8772aab4b8 am: a8c01c923dMatthew Maurer
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/fnv/+/2108487 Change-Id: I41c686d195378f838dec201d83a22d5c90875564 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-31Update TEST_MAPPING am: 8772aab4b8Matthew Maurer
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/fnv/+/2108487 Change-Id: I4af0e6b238c5a70a9d6797717a0f1252e9bb95be 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: I48a542acf56613c98e6ad3b910d3d61df7b405c1
2021-12-15Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING." am: 3c69316d95 ↵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: 7edfadee98 am: 72f3e005b9 am: 68cee702f4 Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/fnv/+/1912520 Change-Id: Ida14fb6737007553870762914fca97335e60ffd4
2021-12-15Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING." am: 3c69316d95 ↵Joel Galenson
am: 7edfadee98 am: 72f3e005b9 Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/fnv/+/1912520 Change-Id: Id4eac5a1913d3c737b896a7acfd4faf09f5c8a88
2021-12-15Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING." am: 3c69316d95 ↵Joel Galenson
am: 7edfadee98 Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/fnv/+/1912520 Change-Id: I0231e1aeb89461b7c917769a194917b7da0c19a2
2021-12-15Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING." am: 3c69316d95Joel Galenson
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/fnv/+/1912520 Change-Id: I3f420981005eb07b0f522a48e9054461d0317b64
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: I7cd6fc5995d429d7eb7142b81d6e33853312a95f
2021-10-08Merge "Add apex to fnv rust crate" am: e574bea4a4 am: 4759579d53 am: ↵Treehugger Robot
56cbcd16fc am: 11ec1dd23b am: 87f141a5fb Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/fnv/+/1850773 Change-Id: Icbf3d51eab4aeadc3ad6b3c73f63975ab7fa34c9
2021-10-08Merge "Add apex to fnv rust crate" am: e574bea4a4 am: 4759579d53 am: ↵Treehugger Robot
56cbcd16fc am: 11ec1dd23b Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/fnv/+/1850773 Change-Id: I3a0b4d733319c23f8fa0992391158c53a469c871
2021-10-08Merge "Add apex to fnv rust crate" am: e574bea4a4 am: 4759579d53 am: 56cbcd16fcTreehugger Robot
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/fnv/+/1850773 Change-Id: I7c7fcd8063ea2a1827be620f5cd82a9020d5b9b6
2021-10-08Merge "Add apex to fnv rust crate" am: e574bea4a4 am: 4759579d53Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/fnv/+/1850773 Change-Id: I340bb9a9e20bc4c8888c6f87659b7819e428422b
2021-10-08Merge "Add apex to fnv rust crate" am: e574bea4a4Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/fnv/+/1850773 Change-Id: Iff8f157ff1c435d079e759cf00630e0f70fdabf7
2021-10-08Merge "Add apex to fnv rust crate"android-s-v2-preview-2android-s-v2-preview-1android-s-v2-beta-2android-s-v2-preview-1Treehugger Robot
2021-10-08Add apex to fnv rust crateJason Macnak
... for eventually including in crosvm build for Cuttlefish. Bug: 189133053 Test: `m` with vulkano gralloc enabled in crosvm Change-Id: I9727bd99eaff4c6dd897b441212afa51ad3918a5
2021-08-24Update TEST_MAPPING am: 16d59a6498 am: a689f62024 am: bf6fa508f9 am: ↵Joel Galenson
89fbab8ab4 am: d50baf611d Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/fnv/+/1806079 Change-Id: I01155970ff0aeb5af8d9ff6ad179c96e1f62b46b
2021-08-24Update TEST_MAPPING am: 16d59a6498 am: a689f62024 am: bf6fa508f9 am: 89fbab8ab4Joel Galenson
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/fnv/+/1806079 Change-Id: I07aec1c8155a3f9fed629e69fd37ed9499e74f48
2021-08-24Update TEST_MAPPING am: 16d59a6498 am: a689f62024 am: bf6fa508f9Joel Galenson
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/fnv/+/1806079 Change-Id: I8d0705145ad99a38108eae846b7b05759bfaacd6
2021-08-24Update TEST_MAPPING am: 16d59a6498 am: a689f62024Joel Galenson
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/fnv/+/1806079 Change-Id: I7e65d29c918aac50d59fcf8b0f2640f8fdc4e4e5
2021-08-24Update TEST_MAPPING am: 16d59a6498Joel Galenson
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/fnv/+/1806079 Change-Id: I29ba7b3cd5e2eebb70f1471f87ec415b8771f91b
2021-08-23Update TEST_MAPPINGandroid-s-beta-5android-s-beta-5Joel Galenson
Test: None Change-Id: I4cea579ab38edc2c2901b41808a9d05a3f7ae2dd
2021-06-02Merge sc-mainline-prodXin Li
Bug: 189946434 Change-Id: I4aaa4bdab6194a749931c10ac3f00eb55d4d9a55
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: e451404f0c -s ↵Xin Li
ours am: e362c7d55f -s ours am: 6f0d015029 -s ours am skip reason: Change-Id I0f78ad7bf0ad839f026c89bca1521fd6a726dae3 with SHA-1 7bf11c94b4 is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Id6c6d8a5c715cebd44d170f3f4396015a5f8ad11
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: e451404f0c -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: e362c7d55f -s ours am: 6f0d015029 -s ours am skip reason: Change-Id I0f78ad7bf0ad839f026c89bca1521fd6a726dae3 with SHA-1 7bf11c94b4 is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I5504fb6fe947c6fab3d740f9d6165b22032bff65
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: e451404f0c -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: e362c7d55f -s ours am skip reason: Change-Id I0f78ad7bf0ad839f026c89bca1521fd6a726dae3 with SHA-1 7bf11c94b4 is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I92b8dd3635d11c60ae50e050dd0218b215c2fd7e
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: e451404f0c -s oursXin Li
am skip reason: Change-Id I0f78ad7bf0ad839f026c89bca1521fd6a726dae3 with SHA-1 7bf11c94b4 is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I5ad37f81967b543b502139046affbf25bf16cb94
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: I0f78ad7bf0ad839f026c89bca1521fd6a726dae3 Change-Id: I6f331b1f990b401653949dce8b35d530a0ad3b0a
2021-02-17[LSC] Add LOCAL_LICENSE_KINDS to external/rust/crates/fnv am: e12be200e5 am: ↵Bob Badour
7a5cc0d3a5 am: aa5d2730bc am: d324380d73 Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/fnv/+/1587402 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I68bfc0d9ba3211a365dff85507fe77d0d567c9f3