summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2021-12-16Snap for 8006021 from 61fbdb4506a7772a21c6f29568fae33fbc63b24b to tm-d1-releaseandroid-13.0.0_r9android-13.0.0_r15android-13.0.0_r14android-13.0.0_r13android-13.0.0_r11android-13.0.0_r10android13-d1-s3-releaseandroid13-d1-s2-releaseandroid13-d1-s1-releaseandroid13-d1-releaseAndroid Build Coastguard Worker
Change-Id: I77b498082c93a52d72422deddef165c0428ce129
2021-12-15Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING." am: d713000e27 ↵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: 5d63966955 am: 1e37f23127 am: d4a89d2db6 Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/cexpr/+/1912047 Change-Id: I1644e1dd60ee05b5474b8dd29043e001a91c9954
2021-12-15Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING." am: d713000e27 ↵Joel Galenson
am: 5d63966955 am: 1e37f23127 Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/cexpr/+/1912047 Change-Id: I331fb995a370a8788f3fdbdc57aa508e3100f900
2021-12-15Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING." am: d713000e27 ↵Joel Galenson
am: 5d63966955 Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/cexpr/+/1912047 Change-Id: I236fdb6639523d041f63f46079b1f5f83a28d982
2021-12-15Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING." am: d713000e27Joel Galenson
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/cexpr/+/1912047 Change-Id: I81456f7aae53338b76a576a6fdfd32aa9402f491
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: I27fcf9fd0b33c06bbabc070ba6ed8c28cce341ff
2021-10-15Snap for 7825444 from 2763366af46d53413ee16578fce3d05415cef3ac to tm-d1-releaseAndroid Build Coastguard Worker
Change-Id: Ia3df5ffc173d04ccd5b27bcec76c68e44c2d6ecf
2021-10-14Merge "Upgrade to nom-7." am: f8576eaeb6 am: 1ff204f380 am: 497e78cc06 am: ↵Joel Galenson
e18d688c4b am: bbe5784fc2 Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/cexpr/+/1840658 Change-Id: I3dac31f03d60bf6e2303dfb16a0a453587773d7d
2021-10-14Merge "Upgrade to nom-7." am: f8576eaeb6 am: 1ff204f380 am: 497e78cc06 am: ↵Joel Galenson
e18d688c4b Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/cexpr/+/1840658 Change-Id: I8ea7a86234f308a90ad6de28c9b0021098a3e633
2021-10-14Merge "Upgrade to nom-7." am: f8576eaeb6 am: 1ff204f380 am: 497e78cc06Joel Galenson
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/cexpr/+/1840658 Change-Id: Idc6a5f8ae9f77b8b847f45a83df6c66cac91cc90
2021-10-14Merge "Upgrade to nom-7." am: f8576eaeb6 am: 1ff204f380Joel Galenson
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/cexpr/+/1840658 Change-Id: Ie96b93b3e271531962542358797bf8e8d0e1de4a
2021-10-14Merge "Upgrade to nom-7." am: f8576eaeb6Joel Galenson
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/cexpr/+/1840658 Change-Id: If4d3356c09b2bf6575627810ee28c2fb9e9e2708
2021-10-14Merge "Upgrade to nom-7."android-s-v2-preview-2android-s-v2-preview-1android-s-v2-beta-2android-s-v2-preview-1Joel Galenson
2021-09-29Upgrade to nom-7.Joel Galenson
This is upstream at https://github.com/jethrogb/rust-cexpr/pull/31. Test: Build Test: cargo test Change-Id: Id88bceef543821aafd855fee17643c782d0a5212
2021-08-31Snap for 7688365 from adc1649d1e5f28ebe6a4d306cabf911724cb3e31 to tm-d1-releaseAndroid Build Coastguard Worker
Change-Id: I0687699c8710eaff652ead3bf3d15f60020fc2c5
2021-08-30Update TEST_MAPPING am: dc2e95e118 am: 08424eb43d am: 57b575a2fd am: ↵Joel Galenson
2aba1a6a39 am: 37394f2c19 Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/cexpr/+/1813777 Change-Id: I7cf0f3c565b5ee7312cf7590563d387c0bcb585a
2021-08-30Update TEST_MAPPING am: dc2e95e118 am: 08424eb43d am: 57b575a2fd am: 2aba1a6a39Joel Galenson
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/cexpr/+/1813777 Change-Id: I8a102522e3d08ba63e97b3b74bbddf749e0005fc
2021-08-30Update TEST_MAPPING am: dc2e95e118 am: 08424eb43d am: 57b575a2fdJoel Galenson
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/cexpr/+/1813777 Change-Id: I4df2aa289dab40fa70e4db07abd5ce82ff7603b8
2021-08-30Update TEST_MAPPING am: dc2e95e118 am: 08424eb43dJoel Galenson
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/cexpr/+/1813777 Change-Id: I6fc940e1bedd278615d5e50c779097e8e5e879c2
2021-08-30Update TEST_MAPPING am: dc2e95e118Joel Galenson
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/cexpr/+/1813777 Change-Id: Id2e1d53d29795dc69fb8575956f896b35903af1d
2021-08-30Update TEST_MAPPINGandroid-s-beta-5android-s-beta-5Joel Galenson
Test: None Change-Id: I4c7fdf2b662501d050b68bd3527898cc05d4d82a
2021-08-25Snap for 7671452 from 50b72db81c24b08a0e472021f7b28204a1f4b517 to tm-d1-releaseAndroid Build Coastguard Worker
Change-Id: I3ca9a4aa61c541cbc2246a2472ad891ec5f3066f
2021-08-24Update TEST_MAPPING am: 1e67d003f8 am: 31cb178389 am: 199e755c32 am: ↵Joel Galenson
f8dd0168f2 am: 5287613e2c Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/cexpr/+/1806067 Change-Id: I72b706f031fcbb55f3776c1f646053c8b3b976ec
2021-08-24Update TEST_MAPPING am: 1e67d003f8 am: 31cb178389 am: 199e755c32 am: f8dd0168f2Joel Galenson
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/cexpr/+/1806067 Change-Id: I7f134544bfa7f7badc5564961ae1bd4719a091e6
2021-08-24Update TEST_MAPPING am: 1e67d003f8 am: 31cb178389 am: 199e755c32Joel Galenson
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/cexpr/+/1806067 Change-Id: Ib4ccee435dc4aaf40bd9ee4751338672cddfc6af
2021-08-24Update TEST_MAPPING am: 1e67d003f8 am: 31cb178389Joel Galenson
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/cexpr/+/1806067 Change-Id: I6c481caee975f772763a1b971bce7d0bece5f2d1
2021-08-24Update TEST_MAPPING am: 1e67d003f8Joel Galenson
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/cexpr/+/1806067 Change-Id: I152aef74ac014be041a34c8af9a086525e9f7a78
2021-08-23Update TEST_MAPPINGJoel Galenson
Test: None Change-Id: I19e4cb0920ac5b88a73bd6cfc840066ea6966990
2021-07-07Snap for 7526140 from d88018e722958d63249b8b317c9ad98f99686bd0 to tm-d1-releaseAndroid Build Coastguard Worker
Change-Id: Ie6b1d8d1623b9518f8cc981f19a40615be2fcd8f
2021-07-06Update vpnprofilestore_test to legacykeystore_test in TEST_MAPPING am: ↵easoncylee
eeb6be2901 am: 4107fade78 am: a6f3625c20 am: 3d8624d77b Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/cexpr/+/1756437 Change-Id: I885ab2a5f3b21528330a84c9dd4bfaf6761242ca
2021-07-06Update vpnprofilestore_test to legacykeystore_test in TEST_MAPPING am: ↵easoncylee
eeb6be2901 am: 4107fade78 am: a6f3625c20 Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/cexpr/+/1756437 Change-Id: Ib929d79358a730c434450ccdefe2c4ffd8450212
2021-07-06Update vpnprofilestore_test to legacykeystore_test in TEST_MAPPING am: ↵easoncylee
eeb6be2901 am: 4107fade78 Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/cexpr/+/1756437 Change-Id: Id45934cc16af94d37f386a80347492b7efeeafbf
2021-07-06Update vpnprofilestore_test to legacykeystore_test in TEST_MAPPING am: ↵easoncylee
eeb6be2901 Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/cexpr/+/1756437 Change-Id: I07fce8124057903e747a87a8bb9110f71b7e6637
2021-07-06Update vpnprofilestore_test to legacykeystore_test in TEST_MAPPINGandroid-s-beta-4android-s-beta-3android-s-beta-4easoncylee
The test had been changed to legacykeystore_test from ag/14968529 Bug: 192796637 Test: presubmit Change-Id: Ib06ba7205eb6142484569a58ff111ad914c625f9
2021-06-23Snap for 7482813 from 4a4cfa12d3b9cf4d27cf493eed49924cc4bcd5ba to tm-d1-releaseAndroid Build Coastguard Worker
Change-Id: I3e45e3823e25d246c097d40a017b266f5f19b0ee
2021-06-22Upgrade to 0.5.0 am: c66cc18cf8 am: f9419a8e45 am: 8e151c2f90 am: b5278c9a05Thiébaud Weksteen
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/cexpr/+/1742201 Change-Id: Ib522eabbeb50ddf8d9cc6641f749208dfb15f8f7
2021-06-22Upgrade to 0.5.0 am: c66cc18cf8 am: f9419a8e45 am: 8e151c2f90Thiébaud Weksteen
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/cexpr/+/1742201 Change-Id: I2640845dde7f93b9cd7aab6da3f99093c7f796c3
2021-06-22Upgrade to 0.5.0 am: c66cc18cf8 am: f9419a8e45Thiébaud Weksteen
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/cexpr/+/1742201 Change-Id: If8d22d5772b8d0b9dae0a3146b0e28073129dd34
2021-06-22Upgrade to 0.5.0 am: c66cc18cf8Thiébaud Weksteen
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/cexpr/+/1742201 Change-Id: I55f4137fa36517d334e945caa442cd6395ee145a
2021-06-21Upgrade to 0.5.0Thiébaud Weksteen
Change-Id: I2fb14867fe1f9993a7f5ba475b8b3a84002a4cb3
2021-06-03Snap for 7418644 from 4d9c470988e13966175cbb546a6ac7a8fb98d9f1 to tm-d1-releaseandroid-build-team Robot
Change-Id: I41ae7b4273f037c5e5d786f43c6f322de6a09cf2
2021-06-02Merge sc-mainline-prodXin Li
Bug: 189946434 Change-Id: I5b644f004b7d2147c1e3e558e28cf33c3a65bd1f
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 6554a29160 -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: 303fcb8449 -s ours am: a007422115 -s ours am skip reason: Change-Id I270b10a5f8bbc2357569fc5743807d1266b280bc with SHA-1 77682a951d is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I862129cbc99517401c03cc7e075b9c13893e36c9
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 6554a29160 -s ↵Xin Li
ours am: 303fcb8449 -s ours am: a007422115 -s ours am skip reason: Change-Id I270b10a5f8bbc2357569fc5743807d1266b280bc with SHA-1 77682a951d is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ib84938c600a472b60720e8351fd87137a99b97f2
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 6554a29160 -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: 303fcb8449 -s ours am skip reason: Change-Id I270b10a5f8bbc2357569fc5743807d1266b280bc with SHA-1 77682a951d is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Idc95e785d4f5bbed5bc607fb15318f02bae0fdc6
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 6554a29160 -s oursXin Li
am skip reason: Change-Id I270b10a5f8bbc2357569fc5743807d1266b280bc with SHA-1 77682a951d is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I903c9445d062f82b55770c4038cda75a593b850f
2021-02-20Mark ab/7061308 as merged in stage.android-s-beta-2android-s-beta-1Xin Li
Bug: 180401296 Merged-In: I270b10a5f8bbc2357569fc5743807d1266b280bc Change-Id: Ib23ed7fbec8635f8d39267f17d573ac82433ac89
2021-02-17Merge "Clean up rust_test_host TEST_MAPPING after default update" am: ↵Treehugger Robot
8e7b3701dc am: 741136111a am: 5088056049 am: 83d1272d61 Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/cexpr/+/1590594 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Iaf749b51644b57154706ac230484cc2afe12f4d8
2021-02-17Merge "Clean up rust_test_host TEST_MAPPING after default update" am: ↵Treehugger Robot
8e7b3701dc am: 741136111a am: 5088056049 am: 83d1272d61 Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/cexpr/+/1590594 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Iaaedc7560ce9e0589de3d5069374f01eaad75b66