summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2022-09-08Use heck-0.3.3 am: 960abda7c6 am: 8d4f507515 am: 5639047125 am: 3c96ba54d5main-16k-with-phonesMatthew Maurer
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/structopt-derive/+/2209805 Change-Id: I76e61bc7369be5c06de14744915272b34b31d088 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-08Use heck-0.3.3 am: 960abda7c6 am: 8d4f507515 am: 5639047125Matthew Maurer
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/structopt-derive/+/2209805 Change-Id: Ibcdce76fa5bc0e9ec83a4a2ac0bf7540ee412d5b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-08Use heck-0.3.3 am: 960abda7c6 am: 8d4f507515Matthew Maurer
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/structopt-derive/+/2209805 Change-Id: I7df31f5d334ce0c64bb8589b56a164661b90cea2 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-08Use heck-0.3.3 am: 960abda7c6Matthew Maurer
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/structopt-derive/+/2209805 Change-Id: I25660cc29c1339da319c7785d2a2d9ad2c84b625 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-07Use heck-0.3.3main-16kMatthew Maurer
Structopt is EOL and will not update to 0.4 The plan for migrating off is to delete structopt after migrating clients to clap + clap-derive "tests" is removed from cargo2android.json to avoid a bug in cargo2android.py which will currently generate a test target when there are 0 tests. As this project is EOL and has no tests, this should not cause trouble. Test: mm Change-Id: I31824494e12bd6fd66a3effe4bf756a896815045
2022-06-15Merge "Update TEST_MAPPING" am: 6cb1157574 am: 50f2413874 am: d8c31b14a5 am: ↵Treehugger Robot
264178f914 Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/structopt-derive/+/2123298 Change-Id: I88c80e73c6d276ebd0683dbe841d44cfa97f7288 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-15Merge "Update TEST_MAPPING" am: 6cb1157574 am: 50f2413874 am: d8c31b14a5Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/structopt-derive/+/2123298 Change-Id: I0c8a7fd88b5ffa2d4c53715ab3a381706ef5306f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-15Merge "Update TEST_MAPPING" am: 6cb1157574 am: 50f2413874Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/structopt-derive/+/2123298 Change-Id: I9458bdade1ec48dc5ed51f2966e951869b43b06c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-15Merge "Update TEST_MAPPING" am: 6cb1157574Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/structopt-derive/+/2123298 Change-Id: Id7588d631673a8f2b02fea819a75e81d2291c647 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: Ie7e0d827c151065443fb9ada97e285a4694d0717
2022-05-31Update TEST_MAPPING am: fa4b6b3a8a am: ddd1d95b72 am: 912265b845 am: 74a8719bc5Matthew Maurer
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/structopt-derive/+/2108609 Change-Id: Iee7a3fe0343565af39bf9022d5e5ffdbade7b1fb Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-31Update TEST_MAPPING am: fa4b6b3a8a am: ddd1d95b72 am: 912265b845Matthew Maurer
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/structopt-derive/+/2108609 Change-Id: Id8142a4df592fa969780026991b3c4e05db490d3 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-31Update TEST_MAPPING am: fa4b6b3a8a am: ddd1d95b72Matthew Maurer
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/structopt-derive/+/2108609 Change-Id: Ie8dda1075982e550fbf0e825cb6ed41bcd3f5087 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-31Update TEST_MAPPING am: fa4b6b3a8aMatthew Maurer
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/structopt-derive/+/2108609 Change-Id: I625c249415b5bad642d2b94ea6f3a9f374f7f38a 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: If8529c138a0375e6df4839938a691b4cd98a0748
2022-03-08Merge "Update structopt-derive to 0.4.18" am: e8905e91b8 am: b74cbda041 am: ↵t_frc_odp_330442040t_frc_odp_330442000t_frc_ase_330444010android-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_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_r32aml_go_odp_330912000aml_go_ads_330915100aml_go_ads_330915000aml_go_ads_330913000android13-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-mainline-go-adservices-releaseandroid13-frc-odp-releaseandroid13-devandroid13-d4-s2-releaseandroid13-d4-s1-releaseandroid13-d4-releaseandroid13-d3-s1-releaseTreehugger Robot
6c9e7633f0 Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/structopt-derive/+/2005115 Change-Id: I4ada9ddd2bd2046bb77343e0a224ee1c886d36a9
2022-03-08Merge "Update structopt-derive to 0.4.18" am: e8905e91b8 am: b74cbda041Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/structopt-derive/+/2005115 Change-Id: Ia143aebdf64919ca401da6b7a23a416cc50ec867
2022-03-08Merge "Update structopt-derive to 0.4.18" am: e8905e91b8Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/structopt-derive/+/2005115 Change-Id: Ifa7867dc9933c9279b325bd3366b0c0d00c43da6
2022-03-08Merge "Update structopt-derive to 0.4.18"Treehugger Robot
2022-03-02Update structopt-derive to 0.4.18David LeGare
Test: cd external/rust/crates && atest --host -c Change-Id: I01c0867da7538adb52ee56fd3143c39d23fbf22c
2021-12-15Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING." am: 99dc3539da ↵Joel Galenson
am: 12984bfa87 am: a6eda40d4c am: d68c3e4c8a Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/structopt-derive/+/1912697 Change-Id: I909ddfedccc203b3ef06841f4626530ec660a2bb
2021-12-15Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING." am: 99dc3539da ↵Joel Galenson
am: 12984bfa87 am: a6eda40d4c Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/structopt-derive/+/1912697 Change-Id: I46aa739214dfd727217076068bd4efc563b14f3f
2021-12-15Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING." am: 99dc3539da ↵Joel Galenson
am: 12984bfa87 Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/structopt-derive/+/1912697 Change-Id: Ie7e9f0f5a869c4f9bbd1f38eaa18deff8d01bd38
2021-12-15Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING." am: 99dc3539daJoel Galenson
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/structopt-derive/+/1912697 Change-Id: Ia412b44817b07d5a7f012fa927aaa6fe5c7770d9
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: Ie213596d38c91dcb50ceeede4cb55b28d174af8e
2021-10-12Merge "Upgrade rust/crates/structopt-derive to 0.4.16" am: 6a8fd71e87 am: ↵Joel Galenson
5162c84530 am: 08b93b9202 am: 3ad58637ab am: e7e7f4dfc1 Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/structopt-derive/+/1833387 Change-Id: I9e0344d62efc4c97da9f48004902ca239a08fd23
2021-10-12Merge "Upgrade rust/crates/structopt-derive to 0.4.16" am: 6a8fd71e87 am: ↵Joel Galenson
5162c84530 am: 08b93b9202 am: 3ad58637ab Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/structopt-derive/+/1833387 Change-Id: Ic7f3faa0f6cc3901602d91aa2d11e068f7c71140
2021-10-12Merge "Upgrade rust/crates/structopt-derive to 0.4.16" am: 6a8fd71e87 am: ↵Joel Galenson
5162c84530 am: 08b93b9202 Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/structopt-derive/+/1833387 Change-Id: If839d9b7baadfc30f2e401a700909cd599e9f775
2021-10-12Merge "Upgrade rust/crates/structopt-derive to 0.4.16" am: 6a8fd71e87 am: ↵Joel Galenson
5162c84530 Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/structopt-derive/+/1833387 Change-Id: I7fdffe72c85e2ad54c6957e11cc5ef55054963b5
2021-10-12Merge "Upgrade rust/crates/structopt-derive to 0.4.16" am: 6a8fd71e87Joel Galenson
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/structopt-derive/+/1833387 Change-Id: I707ca0c245061f9f3f00caa6b98f78c24531a52f
2021-10-12Merge "Upgrade rust/crates/structopt-derive to 0.4.16"android-s-v2-preview-2android-s-v2-preview-1android-s-v2-beta-2android-s-v2-preview-1Joel Galenson
2021-09-22Upgrade rust/crates/structopt-derive to 0.4.16Joel Galenson
Test: make Change-Id: I184dfb62405c060efdb5fc67f3ab22d7285f64a1
2021-08-30Update TEST_MAPPING am: bd8802d955 am: 27382bd5e7 am: 5fff2c7f37 am: ↵Joel Galenson
18bd2b94f4 am: ca64e7aedc Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/structopt-derive/+/1813981 Change-Id: Ifb30c9069b892bfe45a6b9216d11616cbc9ddd09
2021-08-30Update TEST_MAPPING am: bd8802d955 am: 27382bd5e7 am: 5fff2c7f37 am: 18bd2b94f4Joel Galenson
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/structopt-derive/+/1813981 Change-Id: Id04845ca002c7f70999d71d76a7ab3cc74d818bd
2021-08-30Update TEST_MAPPING am: bd8802d955 am: 27382bd5e7 am: 5fff2c7f37Joel Galenson
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/structopt-derive/+/1813981 Change-Id: Iccd7006c33452c9e80f64425a8e4ae79e06a86f3
2021-08-30Update TEST_MAPPING am: bd8802d955 am: 27382bd5e7Joel Galenson
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/structopt-derive/+/1813981 Change-Id: Idfbbd1f840027c7a5e84dfd09b62c9ffa43202e2
2021-08-30Update TEST_MAPPING am: bd8802d955Joel Galenson
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/structopt-derive/+/1813981 Change-Id: Icb53b2f806005cd865d67b78a33dda008f0cce79
2021-08-30Update TEST_MAPPINGandroid-s-beta-5android-s-beta-5Joel Galenson
Test: None Change-Id: Ibcba5d8c5977fb0c5b506937052d84512149932d
2021-08-10Upgrade rust/crates/structopt-derive to 0.4.15 am: 7081b4a371 am: 2aef36ce18 ↵Joel Galenson
am: 517dacdb4f am: d3dbc4c419 am: 330dd68692 Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/structopt-derive/+/1791009 Change-Id: Ia8589e263e5e82e4e580708f2fe74e935397019c
2021-08-10Upgrade rust/crates/structopt-derive to 0.4.15 am: 7081b4a371 am: 2aef36ce18 ↵Joel Galenson
am: 517dacdb4f am: d3dbc4c419 Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/structopt-derive/+/1791009 Change-Id: Icde8dccfb357199cb0bfae474ada2b4da4253e1e
2021-08-10Upgrade rust/crates/structopt-derive to 0.4.15 am: 7081b4a371 am: 2aef36ce18 ↵Joel Galenson
am: 517dacdb4f Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/structopt-derive/+/1791009 Change-Id: I50da9fb579a1ac9964422a1b17a063a099bb25ae
2021-08-10Upgrade rust/crates/structopt-derive to 0.4.15 am: 7081b4a371 am: 2aef36ce18Joel Galenson
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/structopt-derive/+/1791009 Change-Id: Ib0bc5159e70ca08dbd001ba600f9477cf1228d7d
2021-08-10Upgrade rust/crates/structopt-derive to 0.4.15 am: 7081b4a371Joel Galenson
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/structopt-derive/+/1791009 Change-Id: Ifb5484ac9b0bef319d83c215f17496ae1d0cc0fd
2021-08-09Upgrade rust/crates/structopt-derive to 0.4.15Joel Galenson
Test: make Change-Id: I6c0f440b3a56a4d7d5d502845d134218cd8471be
2021-06-02Merge sc-mainline-prodXin Li
Bug: 189946434 Change-Id: I84d5694caca6764f3bcec0819c969eb3bdad15dd
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 38b91cbfd6 -s ↵Xin Li
ours am: 9123f6d21e -s ours am: 54da77dcb5 -s ours am skip reason: Change-Id Ia7429fd7c84d27fb6872987c32b3e90d97c80647 with SHA-1 0c86dcb75a is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ibedaeb40b98c0d89ac384cf77c79e9391568094c
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 38b91cbfd6 -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: 9123f6d21e -s ours am: 54da77dcb5 -s ours am skip reason: Change-Id Ia7429fd7c84d27fb6872987c32b3e90d97c80647 with SHA-1 0c86dcb75a is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I75a724b05f1f566fcadb6104c7fa231b6ce8ee1a
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 38b91cbfd6 -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: 9123f6d21e -s ours am skip reason: Change-Id Ia7429fd7c84d27fb6872987c32b3e90d97c80647 with SHA-1 0c86dcb75a is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I5ee846c21b0fc4fe02791a04d354e998d037af1c
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-10 21:10:53 +0000