aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2022-03-16Merge "Update TEST_MAPPING" am: 426246d395 am: 281e76a385 am: d930d26b19 am: ↵aml_tz4_332714070aml_tz4_332714050aml_tz4_332714010aml_tz4_331910000aml_tz4_331314030aml_tz4_331314020aml_tz4_331314010aml_tz4_331012050aml_tz4_331012040aml_tz4_331012000aml_ase_331311020aml_ase_331112000aml_ase_331011020android13-mainline-tzdata4-releaseandroid13-mainline-appsearch-releaseaml_tz4_332714010Treehugger Robot
638d0ee87b Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/smallvec/+/2004835 Change-Id: I0eaeda898febcbac3913208020bba04d3939de58
2022-03-16Merge "Update TEST_MAPPING" am: 426246d395 am: 281e76a385 am: d930d26b19t_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
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/smallvec/+/2004835 Change-Id: Ia111e882341da6a0a4b33a1bacaeb019ffc63dcd
2022-03-16Merge "Update TEST_MAPPING" am: 426246d395 am: 281e76a385Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/smallvec/+/2004835 Change-Id: I4b829c3abfe476c2015b813e126367cfbd7f1010
2022-03-15Merge "Update TEST_MAPPING" am: 426246d395Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/smallvec/+/2004835 Change-Id: Ic6705f047e79aa0ddfe98fcf6fd139f0486cf640
2022-03-15Merge "Update TEST_MAPPING"Treehugger Robot
2022-03-09Snap for 8276267 from e0b44273da9791e3096f91d373f9d47e1c454310 to udc-releaseAndroid Build Coastguard Worker
Change-Id: I56b7359fc30abfff6378cd760cd802ac6df59cbc
2022-03-08Merge "Update smallvec to 1.8.0" am: 2b8efd428c am: 3d0e7105d4 am: ↵Treehugger Robot
ac24ff2144 am: 65a04b3848 am: 98fe7a8b43 Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/smallvec/+/2004421 Change-Id: I9286686e6e943b6b402ff5f75a3c70b623760ec3
2022-03-08Merge "Update smallvec to 1.8.0" am: 2b8efd428c am: 3d0e7105d4 am: ↵Treehugger Robot
ac24ff2144 am: 65a04b3848 Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/smallvec/+/2004421 Change-Id: Ic4eb31a4a92e027d63f8ce48383e1762ff076af9
2022-03-08Merge "Update smallvec to 1.8.0" am: 2b8efd428c am: 3d0e7105d4 am: ↵Treehugger Robot
ac24ff2144 am: 65a04b3848 Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/smallvec/+/2004421 Change-Id: I345e5d712b639b1127c5af6b4c32a3a740295409
2022-03-08Merge "Update smallvec to 1.8.0" am: 2b8efd428c am: 3d0e7105d4 am: ac24ff2144Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/smallvec/+/2004421 Change-Id: I9b7a911a4b5894136e9368835a7680457937ad11
2022-03-08Merge "Update smallvec to 1.8.0" am: 2b8efd428c am: 3d0e7105d4Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/smallvec/+/2004421 Change-Id: I2161ea8a48db4249effa6baee5ec05fc2178e3d1
2022-03-08Merge "Update smallvec to 1.8.0" am: 2b8efd428cTreehugger Robot
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/smallvec/+/2004421 Change-Id: I4359d74a1c66b9dde2b6b905d019425be6941c26
2022-03-08Merge "Update smallvec to 1.8.0"Treehugger Robot
2022-03-08Update TEST_MAPPINGDavid LeGare
Test: cd external/rust/crates && atest --host -c Change-Id: Ib48a7fe57c6a644e1a44c3d697146c3fec568edd
2022-03-02Update smallvec to 1.8.0David LeGare
Test: cd external/rust/crates && atest --host -c Change-Id: I2a9bbf3cbe9a9458f13552e4c09e33f231a96b57
2022-02-15Snap for 8183730 from bcbb2293e68b7ea9e451b4af2b3c5474708b6f59 to udc-releaseAndroid Build Coastguard Worker
Change-Id: Id80a1cf5c92d75bc234c2b185f1a6773b6193f43
2021-12-22Adding bluetooth apex am: c88ecc614c am: 8464974135 am: 736d22dec9 am: ↵Roopa Sattiraju
38a95dd734 Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/smallvec/+/1931446 Change-Id: I5acd88d5fe3811412b70eda5804ece5384af60a4
2021-12-22Adding bluetooth apex am: c88ecc614c am: 8464974135 am: 736d22dec9Roopa Sattiraju
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/smallvec/+/1931446 Change-Id: I08abdac8058df570a60e8676f7ef2ee787bf71a3
2021-12-22Adding bluetooth apex am: c88ecc614c am: 8464974135Roopa Sattiraju
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/smallvec/+/1931446 Change-Id: Icd52bf09574f81651b83d6cba76b543eca653215
2021-12-22Adding bluetooth apex am: c88ecc614cRoopa Sattiraju
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/smallvec/+/1931446 Change-Id: I1e9c2a1f48d55a39cd02e7201468a4f2d1b4d83f
2021-12-21Adding bluetooth apexandroid-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-1Roopa Sattiraju
Bug: 206121418 Test: Compile Change-Id: I472f03f9acea27a885639f8cbd74b42d4658b99f
2021-12-15Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING." am: 44b1240f83 ↵Joel Galenson
am: 4541755b55 am: 3f692fedda am: 51c7b5e9ed Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/smallvec/+/1912852 Change-Id: I7055c8d92b16469ea78b96c1997d6fb066fb4c0d
2021-12-15Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING." am: 44b1240f83 ↵Joel Galenson
am: 4541755b55 am: 3f692fedda Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/smallvec/+/1912852 Change-Id: Ib3edd21aaa54bd04e7347a74703c1b7c75b2cbd3
2021-12-15Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING." am: 44b1240f83 ↵Joel Galenson
am: 4541755b55 Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/smallvec/+/1912852 Change-Id: Ib61c06a3eed981beeeb1ecc5e24c51c9b7f365c9
2021-12-15Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING." am: 44b1240f83Joel Galenson
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/smallvec/+/1912852 Change-Id: Iaf64c7f2a0555f427d184c7ba4f485b9aa517474
2021-12-15Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING."Joel Galenson
2021-12-10Refresh Android.bp, cargo2android.json, TEST_MAPPING.Joel Galenson
Test: None Change-Id: I1b627bb8cfed145b7ffbd25c8bee8cfc404cf054
2021-08-24Update TEST_MAPPING am: 703b0af731 am: 90cb51a2e0 am: 749c533042 am: ↵Joel Galenson
dd7deac4d6 am: cd274953a0 Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/smallvec/+/1806171 Change-Id: I386fb7219fe4f825a30c068bd05307d34526d696
2021-08-24Update TEST_MAPPING am: 703b0af731 am: 90cb51a2e0 am: 749c533042 am: dd7deac4d6Joel Galenson
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/smallvec/+/1806171 Change-Id: Ic43bc6425bb44634914479c8f6d3810080420d04
2021-08-24Update TEST_MAPPING am: 703b0af731 am: 90cb51a2e0 am: 749c533042Joel Galenson
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/smallvec/+/1806171 Change-Id: I0c5db506006b04d5a7722c22c0850be81839dca1
2021-08-24Update TEST_MAPPING am: 703b0af731 am: 90cb51a2e0Joel Galenson
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/smallvec/+/1806171 Change-Id: I2fbede1e48fbf4d98156eb6c48fa8eecaa8bbc0a
2021-08-24Update TEST_MAPPING am: 703b0af731android-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/smallvec/+/1806171 Change-Id: I8a03be2935cc7c2264b6891b5b463c89ca04feae
2021-08-23Update TEST_MAPPINGandroid-s-beta-5android-s-beta-5Joel Galenson
Test: None Change-Id: I23bd10412d38369768777cd124205caffecd0a1d
2021-06-02Merge sc-mainline-prodXin Li
Bug: 189946434 Change-Id: I5e1bb33ac48d355072ce784fb907cfaa878023fb
2021-06-01Remove patch and use config file. am: 9aa887234f am: 7c49fca48b am: ↵Joel Galenson
9603682420 am: ffe606899b Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/smallvec/+/1723362 Change-Id: I748c83d5318809f959207717827487a9d85f60a4
2021-06-01Remove patch and use config file. am: 9aa887234f am: 7c49fca48b am: 9603682420Joel Galenson
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/smallvec/+/1723362 Change-Id: I97d0466bd7c5957f9a6834ba921bfd5449ea0b62
2021-06-01Remove patch and use config file. am: 9aa887234f am: 7c49fca48bJoel Galenson
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/smallvec/+/1723362 Change-Id: Ib17aeb9304ede24ac5543e3aa7e96a9e8bf2bc3d
2021-06-01Remove patch and use config file. am: 9aa887234fandroid-s-beta-4android-s-beta-3android-s-beta-4Joel Galenson
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/smallvec/+/1723362 Change-Id: I8977498edcf234d799e2cb744135b44ded8519fb
2021-06-01Remove patch and use config file.Joel Galenson
Test: Build Test: Run cargo2android.py. Change-Id: Ie22609d29543b15c87df50ef1289e42f4cff2898
2021-05-15Configure apex so crosvm can depend on this crate am: 784e24eb3f am: ↵Jorge E. Moreira
d4865997bc am: 71bc75fce8 am: 7728b23a4c am: 8616cc02da Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/smallvec/+/1684666 Change-Id: I411c1434bca6bd43be3456f994063eb04892e4ef
2021-04-26Configure apex so crosvm can depend on this crate am: 784e24eb3f am: ↵android-12.1.0_r26android-12.1.0_r25android-12.1.0_r24android-12.1.0_r23android-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_r12android12L-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-releaseJorge E. Moreira
d4865997bc am: 71bc75fce8 am: 7728b23a4c Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/smallvec/+/1684666 Change-Id: I255f5a74846dce3a6131a53a4fce96569796f0e7
2021-04-26Configure apex so crosvm can depend on this crate am: 784e24eb3f am: ↵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-releaseJorge E. Moreira
d4865997bc am: 71bc75fce8 am: 7728b23a4c Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/smallvec/+/1684666 Change-Id: Idd4a6b8ca219c6225c7307fa8b4cdbdfc57b426e
2021-04-26Configure apex so crosvm can depend on this crate am: 784e24eb3f am: ↵Jorge E. Moreira
d4865997bc am: 71bc75fce8 am: 7728b23a4c Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/smallvec/+/1684666 Change-Id: I925e7785a5e8c1ea1955b652d379c251dbe6bb04
2021-04-26Configure apex so crosvm can depend on this crate am: 784e24eb3f am: ↵android-12.1.0_r9android-12.1.0_r8android-12.1.0_r7android-12.1.0_r22android-12.1.0_r21android-12.1.0_r20android-12.1.0_r19android-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-devandroid12-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-devJorge E. Moreira
d4865997bc am: 71bc75fce8 Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/smallvec/+/1684666 Change-Id: Ia2a15cd183df49ee3f0a9d3a328abe75ee5cba9c
2021-04-26Configure apex so crosvm can depend on this crate am: 784e24eb3f am: d4865997bcJorge E. Moreira
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/smallvec/+/1684666 Change-Id: I6a5c96c70ab38e37d5e13431ee86e6168ed28471
2021-04-26Configure apex so crosvm can depend on this crate am: 784e24eb3fJorge E. Moreira
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/smallvec/+/1684666 Change-Id: I2e3703dedc937e3e4e4a54beb60ebb15f5f15d95
2021-04-23Configure apex so crosvm can depend on this crateandroid-s-beta-2android-s-beta-1Jorge E. Moreira
Bug: 185155959 Test: locally Change-Id: I2ba7694d4d511e64efc2971dc5549d540398c801
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 2188055b68 -s ↵Xin Li
ours am: 6706c243b2 -s ours am: ae2bd84a0a -s ours am skip reason: Change-Id Ib1995bab25327524c008ae00be310a764aa19f18 with SHA-1 c62d25ec3e is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I986a397bc6c57ce62c025ade743e3c9db61975ab
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 2188055b68 -s ↵Xin Li
ours am: 6706c243b2 -s ours am: ae2bd84a0a -s ours am skip reason: Change-Id Ib1995bab25327524c008ae00be310a764aa19f18 with SHA-1 c62d25ec3e is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I9556442f217b3260c7f49d19f5fd5cb93ce20424
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 2188055b68 -s ↵Xin Li
ours am: 6706c243b2 -s ours am skip reason: Change-Id Ib1995bab25327524c008ae00be310a764aa19f18 with SHA-1 c62d25ec3e is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ib8eeb93b0c7f41dc1fb9ba663574c8bef28c0de2
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-01 06:34:34 +0000