aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2024-03-14Snap for 11574415 from 5d6ab7a9a01f426dfadc533a8d69f3ff7b396075 to ↵emu-35-1-releaseAndroid Build Coastguard Worker
emu-35-1-release Change-Id: Ie4cffbaaccbdc6f144f58fa25ef14f0291d9f8c5
2024-02-08Revert "Upgrade fastrand to 2.0.1" am: a329b7310bemu-34-2-devHyun Jae Moon
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/fastrand/+/2956009 Change-Id: I24a8ab2f46245126c10ae645f43df4732a8a8222 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-08Revert "Upgrade fastrand to 2.0.1"emu-34-3-releaseHyun Jae Moon
This reverts commit f00a459d95e87096a8366dc67f5fbfdf33a4e205. Reason for revert: Breaks netsim + emulator due to tempfile's dependency issue. Change-Id: I48b80276c0754d052bcf270d62df7a375340f099
2024-02-08Upgrade fastrand to 2.0.1 am: f00a459d95Jeff Vander Stoep
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/fastrand/+/2953856 Change-Id: Ifbd87bc93feedac2e3de1fcf5b3b2c14c13fa934 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-08Upgrade fastrand to 2.0.1Jeff Vander Stoep
This project was upgraded with external_updater. Usage: tools/external_updater/updater.sh update external/rust/crates/fastrand For more info, check https://cs.android.com/android/platform/superproject/+/main:tools/external_updater/README.md Test: TreeHugger Change-Id: Idaf0b2bfb1d63fe6d4c2d20aeafb85cc4d742364
2023-11-09Migrate to cargo_embargo. am: 6183a6076e am: d85aa907f0 am: 6836de1436Andrew Walbran
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/fastrand/+/2822398 Change-Id: I8a418da02c77bd54b283612bb2571eb3b452cea7 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-09Migrate to cargo_embargo. am: 6183a6076e am: 60d73396dc am: 404eb3ea8bAndrew Walbran
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/fastrand/+/2822398 Change-Id: I2d1e6eaffb18efa54ecc98c29e7118bdbc3eab1f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-09Migrate to cargo_embargo. am: 6183a6076e am: d85aa907f0Andrew Walbran
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/fastrand/+/2822398 Change-Id: Iac24eaa5d65d2dad4bedaf21465d25b531713819 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-09Migrate to cargo_embargo. am: 6183a6076e am: 60d73396dcAndrew Walbran
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/fastrand/+/2822398 Change-Id: If25718aa69320c3dfa64a9608b5a971e1ddaaf91 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-09Migrate to cargo_embargo. am: 6183a6076eAndrew Walbran
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/fastrand/+/2822398 Change-Id: I011eff18135175606eac68bd79d3b45ecd6bde52 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-09Migrate to cargo_embargo. am: 6183a6076eAndrew Walbran
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/fastrand/+/2822398 Change-Id: Icda363e6ca93c9c6f565d58e498b337310a022f4 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-08Migrate to cargo_embargo.Andrew Walbran
Bug: 293289578 Test: Ran cargo_embargo, compared Android.bp Change-Id: Ifff4232366b5901cb38f2de4b9f306c635482a95
2023-09-07Revert "Upgrade fastrand to 2.0.0" am: 8a27650cbe am: f7f84bb31d am: ↵Weilun Du
f8e39f4fc5 am: 34403a205b am: 967877e38b Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/fastrand/+/2745833 Change-Id: I37a3546d1ccd0c2fae2f89bacc8268f9a0e0bf34 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-07Revert "Upgrade fastrand to 2.0.0" am: 8a27650cbe am: f7f84bb31d am: ↵Weilun Du
f8e39f4fc5 am: 34403a205b Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/fastrand/+/2745833 Change-Id: Ib85aa627d53eb6d47f6205c8d993110cb94d8c8a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-07Revert "Upgrade fastrand to 2.0.0" am: 8a27650cbe am: f7f84bb31d am: f8e39f4fc5Weilun Du
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/fastrand/+/2745833 Change-Id: I1f2289003ad4c4f335631b4c0c9e5ab6bb47167e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-07Revert "Upgrade fastrand to 2.0.0" am: 8a27650cbe am: f7f84bb31dWeilun Du
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/fastrand/+/2745833 Change-Id: Ibfd9b7b0815d99994221d1eb98facead314de9ea Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-07Revert "Upgrade fastrand to 2.0.0" am: 8a27650cbeWeilun Du
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/fastrand/+/2745833 Change-Id: I3362a487d5941a6923dd6b3298d8e9d4773e5cc0 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-07Revert "Upgrade fastrand to 2.0.0"Weilun Du
This reverts commit c5fd900ff30e416bc6c71fd5e46b6d044b2a394e. Reason for revert: Build breakage for go/ab/emu-master-dev since 10772215 Bug: 299464702 Change-Id: I3fdbe5ceef9e0157801d72e1bfd8eb9a6005d441
2023-09-07Upgrade fastrand to 2.0.0 am: c5fd900ff3 am: 7f1904004e am: 61cd768129 am: ↵James Farrell
13a4c08551 am: c9ae6ca7b5 Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/fastrand/+/2740911 Change-Id: I3bf73b9956b548ced0b36877325e869c85c9fe38 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-07Upgrade fastrand to 2.0.0 am: c5fd900ff3 am: 7f1904004e am: 61cd768129 am: ↵James Farrell
13a4c08551 Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/fastrand/+/2740911 Change-Id: I5429e2a091c87f40e5e51b9e0ad232d1560db1a1 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-07Upgrade fastrand to 2.0.0 am: c5fd900ff3 am: 7f1904004e am: 61cd768129James Farrell
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/fastrand/+/2740911 Change-Id: I3593590651d54ef6b1a2b36556825a870a579183 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-07Upgrade fastrand to 2.0.0 am: c5fd900ff3 am: 7f1904004eJames Farrell
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/fastrand/+/2740911 Change-Id: Ieb920c83e76c0c1250e18aba52265422838941ad Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-07Upgrade fastrand to 2.0.0 am: c5fd900ff3James Farrell
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/fastrand/+/2740911 Change-Id: I3dc78a9d20320a8a728fd81e2762ec8c4603166d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-05Upgrade fastrand to 2.0.0James Farrell
This project was upgraded with external_updater. Usage: tools/external_updater/updater.sh update rust/crates/fastrand For more info, check https://cs.android.com/android/platform/superproject/+/main:tools/external_updater/README.md Test: TreeHugger Change-Id: I46d2f7a42890e5ae04f07df79f8edd4d8fe69d95
2023-07-18Move OWNER reference master=>main. am: 0b57c89760 am: 33584a0a20 am: ↵Sam Saccone
0f7b338c44 am: 218364ca76 am: 35a6cd73e9 Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/fastrand/+/2662425 Change-Id: I4170616787f662afecf5961195fbc02bd0b81581 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-18Move OWNER reference master=>main. am: 0b57c89760 am: 33584a0a20 am: ↵Sam Saccone
0f7b338c44 am: 218364ca76 Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/fastrand/+/2662425 Change-Id: Id11ab425169aaf697b861ad6f49760d248905294 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-18Move OWNER reference master=>main. am: 0b57c89760 am: 33584a0a20 am: 0f7b338c44Sam Saccone
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/fastrand/+/2662425 Change-Id: I016f38b7489024e5760c2c07bebbe0ab6b13dcba Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-18Move OWNER reference master=>main. am: 0b57c89760 am: 33584a0a20Sam Saccone
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/fastrand/+/2662425 Change-Id: I2e407cbd81689bc71ea3e949db752f1ca4b576b3 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-18Move OWNER reference master=>main. am: 0b57c89760Sam Saccone
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/fastrand/+/2662425 Change-Id: Ia817bcf34052a95384ab510255f161475e45a45c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-18Move OWNER reference master=>main.emu-33-devSam Saccone
BUG=b/291759353 Change-Id: I23169b100696b094d20beb2da376c4c7baba264b
2023-03-09Merge "Make fastrand available to product and vendor am: d106aef69e am: ↵Automerger Merge Worker
e6d3cd53a1 am: af3508b645 am: f858fea5a2 am: 9ba0a2d209"
2023-03-09Make fastrand available to product and vendor am: d106aef69e am: e6d3cd53a1 ↵Matthew Maurer
am: af3508b645 am: f858fea5a2 am: 9ba0a2d209 Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/fastrand/+/2476343 Change-Id: Ife1ba5b6b522adf8f62f893ef729825e32f8873a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-09Make fastrand available to product and vendor am: d106aef69e am: e6d3cd53a1 ↵Matthew Maurer
am: af3508b645 am: f858fea5a2 am: ca4cfed678 Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/fastrand/+/2476343 Change-Id: Ic2ef164d80a367fc9905fefd9caea2061c8e8927 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-09Make fastrand available to product and vendor am: d106aef69e am: e6d3cd53a1 ↵android-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-releaseMatthew Maurer
am: af3508b645 am: f858fea5a2 Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/fastrand/+/2476343 Change-Id: Ic6f951478b7dd35bac7c03359d84d360b468fd7d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-09Make fastrand available to product and vendor am: d106aef69e am: e6d3cd53a1 ↵aml_wif_341610000aml_wif_341510000aml_wif_341410080aml_wif_341310010aml_wif_341110010aml_wif_341011010aml_wif_340913010aml_uwb_341513070aml_uwb_341511050aml_uwb_341310300aml_uwb_341310030aml_uwb_341111010aml_uwb_341011000aml_tet_341610020aml_tet_341511010aml_tet_341411060aml_tet_341310230aml_tet_341112070aml_tet_341010040aml_tet_340913030aml_swc_341619000aml_swc_341513600aml_swc_341312300aml_swc_341312020aml_swc_341111000aml_swc_341011020aml_swc_340922010aml_sta_341615000aml_sta_341511040aml_sta_341410000aml_sta_341311010aml_sta_341114000aml_sta_341111000aml_sta_341010020aml_sta_340912000aml_sta_340911000aml_sdk_341510000aml_sdk_341410000aml_sdk_341110080aml_sdk_341110000aml_sdk_341010000aml_sdk_340912010aml_sch_341510000aml_res_341510000aml_res_341410010aml_res_341311030aml_res_341110000aml_res_340912000aml_per_341614000aml_per_341510010aml_per_341410020aml_per_341311000aml_per_341110020aml_per_341110010aml_per_341011100aml_per_341011020aml_per_340916010aml_odp_341610000aml_neu_341510000aml_neu_341010080aml_neu_341010000aml_net_341610030aml_net_341510050aml_net_341510000aml_net_341411030aml_net_341311010aml_net_341310020aml_net_341111030aml_net_341014000aml_net_340913000aml_mpr_341614010aml_mpr_341511070aml_mpr_341411070aml_mpr_341313030aml_mpr_341111030aml_mpr_341111020aml_mpr_341015090aml_mpr_341015030aml_mpr_340919000aml_med_341619000aml_med_341513600aml_med_341312300aml_med_341312020aml_med_341111000aml_med_341011000aml_med_340922010aml_ips_341611000aml_ips_341510000aml_ips_340914280aml_ips_340914200aml_ips_340914000aml_ext_341620040aml_ext_341518010aml_ext_341414010aml_ext_341317010aml_ext_341131030aml_ext_341027030aml_doc_341610010aml_doc_341510050aml_doc_341312010aml_doc_341112000aml_doc_341012000aml_doc_340916000aml_con_341614000aml_con_341511080aml_con_341410300aml_con_341310090aml_con_341110000aml_cbr_341610000aml_cbr_341510010aml_cbr_341410010aml_cbr_341311010aml_cbr_341110000aml_cbr_341011000aml_cbr_340914000aml_ase_341510000aml_ase_341410000aml_ase_341310010aml_ase_341113000aml_ase_340913000aml_art_341615020aml_art_341514450aml_art_341514410aml_art_341411300aml_art_341311100aml_art_341110110aml_art_341110060aml_art_341010050aml_art_340915060aml_ads_341615050aml_ads_341517040aml_ads_341413000aml_ads_341316030aml_ads_341131050aml_ads_341027030aml_ads_340915050aml_adb_341520010aml_adb_341517070aml_adb_340912530aml_adb_340912350aml_adb_340912200aml_adb_340912000android14-mainline-wifi-releaseandroid14-mainline-uwb-releaseandroid14-mainline-tethering-releaseandroid14-mainline-sdkext-releaseandroid14-mainline-resolv-releaseandroid14-mainline-permission-releaseandroid14-mainline-os-statsd-releaseandroid14-mainline-networking-releaseandroid14-mainline-mediaprovider-releaseandroid14-mainline-media-swcodec-releaseandroid14-mainline-media-releaseandroid14-mainline-extservices-releaseandroid14-mainline-conscrypt-releaseandroid14-mainline-cellbroadcast-releaseandroid14-mainline-art-releaseandroid14-mainline-appsearch-releaseandroid14-mainline-adservices-releaseandroid14-mainline-adbd-releaseMatthew Maurer
am: af3508b645 am: f858fea5a2 Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/fastrand/+/2476343 Change-Id: Ifc640fb5371565ae4282c789d06e6aff502c21a7 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-09Make fastrand available to product and vendor am: d106aef69e am: e6d3cd53a1 ↵android14-devMatthew Maurer
am: af3508b645 Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/fastrand/+/2476343 Change-Id: I9dc449ce346e558711aa805466759a10914be943 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-09Make fastrand available to product and vendor am: d106aef69e am: e6d3cd53a1Matthew Maurer
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/fastrand/+/2476343 Change-Id: I79a8e96b58a1e454b80b50b21edeb762702fc01d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-09Make fastrand available to product and vendor am: d106aef69eandroid-u-beta-1-gplMatthew Maurer
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/fastrand/+/2476343 Change-Id: Iaf956b4e3e36095f1b79c0d82d41fcd16280dc6d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-07Make fastrand available to product and vendorMatthew Maurer
Bug: 270690570 Test: mma in external/rust/crates Change-Id: I6cdaad330680714d2aeefc55a175e6939ef7ca98
2023-02-24[LSC] Add LOCAL_LICENSE_KINDS to external/rust/crates/fastrand am: ↵Bob Badour
2640f9606d am: f05b192e3b am: b2c6523f46 am: 91b82869ac am: 7fc21f675f Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/fastrand/+/2453305 Change-Id: I41eed8502a63e2dd12e443f2283da543f1090d6c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-24[LSC] Add LOCAL_LICENSE_KINDS to external/rust/crates/fastrand am: ↵Bob Badour
2640f9606d am: f05b192e3b am: b2c6523f46 am: 91b82869ac Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/fastrand/+/2453305 Change-Id: If9c84d1363ebe76484a34f001ac0f5360c4f2f30 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-24[LSC] Add LOCAL_LICENSE_KINDS to external/rust/crates/fastrand am: ↵Bob Badour
2640f9606d am: f05b192e3b am: b2c6523f46 am: 91b82869ac Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/fastrand/+/2453305 Change-Id: I9e75bd669fbed12cb9a342e10a1c5affbe1b3c5a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-24[LSC] Add LOCAL_LICENSE_KINDS to external/rust/crates/fastrand am: ↵Bob Badour
2640f9606d am: f05b192e3b am: b2c6523f46 Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/fastrand/+/2453305 Change-Id: I6836785743cbd6bfd15a03b33cffc79b27d50211 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-24[LSC] Add LOCAL_LICENSE_KINDS to external/rust/crates/fastrand am: ↵Bob Badour
2640f9606d am: f05b192e3b Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/fastrand/+/2453305 Change-Id: I76c08c0763f7b81daf25a161c65f073fb855f96a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-24[LSC] Add LOCAL_LICENSE_KINDS to external/rust/crates/fastrand am: 2640f9606dBob Badour
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/fastrand/+/2453305 Change-Id: I8517ebd3bf8ddf654e7ae77011a12350d0871a6c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-23Add Android.bp am: 8ea5f7c86d am: 2ab4591102 am: 4bb8111a34 am: 4763f6f964 ↵Jeff Vander Stoep
am: db6c54cfa9 Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/fastrand/+/2452805 Change-Id: Ia4f58f90db7d20bac14f6c101df7dce24cebd9a7 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-23Add Android.bp am: 8ea5f7c86d am: 2ab4591102 am: 4bb8111a34 am: 4763f6f964Jeff Vander Stoep
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/fastrand/+/2452805 Change-Id: I72ce232eb76fce367e411d86759ea0eaebff9e8d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-23Add Android.bp am: 8ea5f7c86d am: 2ab4591102 am: 4bb8111a34 am: 4763f6f964Jeff Vander Stoep
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/fastrand/+/2452805 Change-Id: I2295fed4add4e0b4af0d181d207d4607b75a847e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-23Add Android.bp am: 8ea5f7c86d am: 2ab4591102 am: 4bb8111a34Jeff Vander Stoep
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/fastrand/+/2452805 Change-Id: I7dea5df328e96a63d27198c96082526915640eef Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-23Add Android.bp am: 8ea5f7c86d am: 2ab4591102Jeff Vander Stoep
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/fastrand/+/2452805 Change-Id: I75a33e75e15fd197f904cee87a34fa231bddb160 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-14 22:21:01 +0000