aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2022-11-01Snap for 9239618 from 062f4e2688b4259d6c85ce25669b44ecc3377575 to ↵android-platform-13.0.0_r9android-platform-13.0.0_r8android-platform-13.0.0_r7android-platform-13.0.0_r6android-platform-13.0.0_r5android-platform-13.0.0_r4android-platform-13.0.0_r3android-platform-13.0.0_r21android-platform-13.0.0_r20android-platform-13.0.0_r19android-platform-13.0.0_r18android-platform-13.0.0_r17android-platform-13.0.0_r16android-platform-13.0.0_r15android-platform-13.0.0_r14android-platform-13.0.0_r13android-platform-13.0.0_r12android-platform-13.0.0_r11android-platform-13.0.0_r10android13-platform-releaseAndroid Build Coastguard Worker
tm-platform-release Change-Id: I26e74f34b912b7e5816c28fd4f836f760070abf3
2022-10-21Merge commit '6d3814565662d426844b632ec885bd58715ed11e' of ↵Yimin Li
sso://googleplex-android/platform/external/rust/crates/vsock into HEAD Change-Id: I6dc4385789751994fb1bdea2e75a0775dc67def1
2022-04-06Snap for 8414339 from 34c25bb318dc916018e33e50b1fec97323b38532 to ↵android-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_r16android13-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-releaseAndroid Build Coastguard Worker
tm-qpr1-release Change-Id: Icf404b28fc3515b6686fe81ee7e97c51aca9915e
2022-03-22Snap for 8332931 from 34c25bb318dc916018e33e50b1fec97323b38532 to tm-releaseandroid-vts-13.0_r8android-vts-13.0_r7android-vts-13.0_r6android-vts-13.0_r5android-vts-13.0_r4android-vts-13.0_r3android-vts-13.0_r2android-vts-13.0_r1android-security-13.0.0_r9android-security-13.0.0_r8android-security-13.0.0_r7android-security-13.0.0_r6android-security-13.0.0_r5android-security-13.0.0_r4android-security-13.0.0_r3android-security-13.0.0_r2android-security-13.0.0_r19android-security-13.0.0_r18android-security-13.0.0_r17android-security-13.0.0_r16android-security-13.0.0_r15android-security-13.0.0_r14android-security-13.0.0_r13android-security-13.0.0_r12android-security-13.0.0_r11android-security-13.0.0_r10android-security-13.0.0_r1android-platform-13.0.0_r2android-platform-13.0.0_r1android-cts-13.0_r8android-cts-13.0_r7android-cts-13.0_r6android-cts-13.0_r5android-cts-13.0_r4android-cts-13.0_r3android-cts-13.0_r2android-cts-13.0_r1android-13.0.0_r8android-13.0.0_r7android-13.0.0_r6android-13.0.0_r5android-13.0.0_r4android-13.0.0_r31android-13.0.0_r3android-13.0.0_r2android-13.0.0_r12android-13.0.0_r1android13-tests-releaseandroid13-security-releaseandroid13-s3-releaseandroid13-s2-releaseandroid13-s1-releaseandroid13-releaseandroid13-gsiAndroid Build Coastguard Worker
Change-Id: I80442490b41b1cf37da9d7387d2b70765a5ad640
2022-03-21Update vsock to 0.2.6 am: bc5a1c46a7 am: 12119859e2 am: eadfc342fft_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-releaseDavid LeGare
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/vsock/+/2005052 Change-Id: I043a75863ce7428517cdb243d3a4844de23ea475
2022-03-21Update vsock to 0.2.6 am: bc5a1c46a7 am: 12119859e2David LeGare
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/vsock/+/2005052 Change-Id: I521ac949d8c2028c97369ed8dc82b290e7ffe0dc
2022-03-21Update vsock to 0.2.6 am: bc5a1c46a7David LeGare
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/vsock/+/2005052 Change-Id: I28f4b45f03c4c9043a1b6b8476f1009b171264f6
2022-03-09Update vsock to 0.2.6David LeGare
Test: cd external/rust/crates && atest --host -c Change-Id: I7c177a85cfef2cac0a82b939719b69adbc3c053c
2021-12-16Snap for 8006021 from ca1ebcc270db869099c84b08e37b55f6587766b7 to tm-releaseAndroid Build Coastguard Worker
Change-Id: I1bf23c98a6daf350e257f9ce3c453800f4c43389
2021-12-15Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING." am: a5341a6140 ↵Joel Galenson
am: 2b850fd536 am: 4d3f891433 am: bd8cddb34e Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/vsock/+/1912872 Change-Id: I1b3f7254a09e3f29f107e92c8683efe48e602fb9
2021-12-15Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING." am: a5341a6140 ↵Joel Galenson
am: 2b850fd536 am: 4d3f891433 Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/vsock/+/1912872 Change-Id: I0ac5481fc20f9edff056486ed63af5f50c0f1ed3
2021-12-15Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING." am: a5341a6140 ↵Joel Galenson
am: 2b850fd536 Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/vsock/+/1912872 Change-Id: I6935d4e4dc795d43cb3df55de10f622e84fb7100
2021-12-15Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING." am: a5341a6140Joel Galenson
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/vsock/+/1912872 Change-Id: I50dffcbb28155b86cf26147159e35b0f99438455
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: I402a45aecb45789cb899a28b612af97c1ab3103f
2021-11-18Snap for 7925568 from 97d6681a4d123a9d56b1fcf23e4f55339cb75645 to tm-releaseAndroid Build Coastguard Worker
Change-Id: If90286ae8124a4ec799983bf6fb67cfc26d686c2
2021-11-17[automerger skipped] Merge sc-qpr1-dev-plus-aosp-without-vendor@7810918 am: ↵Xin Li
79fd00fce0 -s ours am: 9b67d0dafd -s ours am: 63ca3f9780 -s ours am skip reason: Merged-In I3c2e54dbcdbe3a99017ad31bfc4e76984335b330 with SHA-1 e49a692386 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/rust/crates/vsock/+/16279007 Change-Id: I398d58aeef86c81e8c404564c6a42fb5b411313e
2021-11-17[automerger skipped] Merge sc-qpr1-dev-plus-aosp-without-vendor@7810918 am: ↵Xin Li
79fd00fce0 -s ours am: 9b67d0dafd -s ours am skip reason: Merged-In I3c2e54dbcdbe3a99017ad31bfc4e76984335b330 with SHA-1 e49a692386 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/rust/crates/vsock/+/16279007 Change-Id: I78012352d30cffaf20581f91ea4bf5fd7be9684b
2021-11-17[automerger skipped] Merge sc-qpr1-dev-plus-aosp-without-vendor@7810918 am: ↵Xin Li
79fd00fce0 -s ours am skip reason: Merged-In I3c2e54dbcdbe3a99017ad31bfc4e76984335b330 with SHA-1 e49a692386 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/rust/crates/vsock/+/16279007 Change-Id: Ibcd30106a13a00a4f973de628c36c3cd6c72b31b
2021-11-10Merge sc-qpr1-dev-plus-aosp-without-vendor@7810918Xin Li
Bug: 205056467 Merged-In: I3c2e54dbcdbe3a99017ad31bfc4e76984335b330 Change-Id: Ifded692ddfdfe33e1334bae03f950f5fafea75cf
2021-11-09Snap for 7895410 from c5700a29c89c9c44dad5b5126a6f8a5ec1156df5 to tm-releaseAndroid Build Coastguard Worker
Change-Id: I3777a7f4adbc34554032ec6c875ae0d3f2a9ed0e
2021-11-08Remove deprecated file. am: 0904891fa3 am: bb5f4bcaa3 am: 46b4192eaf am: ↵Joel Galenson
97765dd44a am: 58d8ad82a8 Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/vsock/+/1874520 Change-Id: Id9c24afa3912a8532f4c6b931b209da43d1c64b1
2021-11-08Remove deprecated file. am: 0904891fa3 am: bb5f4bcaa3 am: 46b4192eaf am: ↵Joel Galenson
97765dd44a Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/vsock/+/1874520 Change-Id: Iefc46e7addb0a95602eb31c1bde577d1243c4ab0
2021-11-08Remove deprecated file. am: 0904891fa3 am: bb5f4bcaa3 am: 46b4192eafJoel Galenson
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/vsock/+/1874520 Change-Id: I8946cb7845f1b80b8fbb23a5523c3d6dab5c9aff
2021-11-08Remove deprecated file. am: 0904891fa3 am: bb5f4bcaa3Joel Galenson
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/vsock/+/1874520 Change-Id: I3ba56167fcac4c604deef180f4471354b9563c99
2021-11-08Remove deprecated file. am: 0904891fa3Joel Galenson
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/vsock/+/1874520 Change-Id: I6b08387df58941a13173e53ffdf194df5fef9812
2021-10-28Remove deprecated file.Joel Galenson
This file only talks about a patch that no longer exists. Test: None Change-Id: I384d71fb4ff25cc194c5fb16deccda5df98db9af
2021-08-31Snap for 7688365 from efbc4a7dfb2e57d953c76c98f5b9250a40f127e6 to tm-releaseAndroid Build Coastguard Worker
Change-Id: Ie206fbd71f11c781467a5add48b3b82189936a5d
2021-08-30Update TEST_MAPPING am: 86e6d34be1 am: f32618e388 am: b035745b6d am: ↵Joel Galenson
e49a692386 am: 1321015c31 Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/vsock/+/1813985 Change-Id: I4b7b76766a84e42c8d8c91eb40e7d2ea8eaab8c2
2021-08-30Update TEST_MAPPING am: 86e6d34be1 am: f32618e388 am: b035745b6d am: e49a692386Joel Galenson
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/vsock/+/1813985 Change-Id: I2105c14814c3312b057a8f44625d7e30200c6d96
2021-08-30Update TEST_MAPPING am: 86e6d34be1 am: f32618e388 am: b035745b6dJoel Galenson
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/vsock/+/1813985 Change-Id: I3c2e54dbcdbe3a99017ad31bfc4e76984335b330
2021-08-30Update TEST_MAPPING am: 86e6d34be1 am: f32618e388Joel Galenson
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/vsock/+/1813985 Change-Id: I46407be8491bf609bf15bd1191e96ff78086f55a
2021-08-30Update TEST_MAPPING am: 86e6d34be1android-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/vsock/+/1813985 Change-Id: I4c1668c61e368e8e3cf1cdc50e68352eb7be0b2b
2021-08-30Update TEST_MAPPINGandroid-s-beta-5android-s-beta-5Joel Galenson
Test: None Change-Id: Ie0c964d8c3590c2739dffa009944493c74f1b668
2021-07-14Snap for 7546816 from 4afc6c100d73907523460ee5da51d82bcaa38bb1 to tm-releaseAndroid Build Coastguard Worker
Change-Id: Ic55832465c7128794691469f384836920ca6fb8e
2021-07-12Make libvsock available to the virt APEX am: d8fb876292 am: 94cf58be9b am: ↵Jiyong Park
31ae081f41 am: 627efc0bb9 Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/vsock/+/1762386 Change-Id: I30cd15c66aecfa19bf17cfb324a0c5101b83c4f8
2021-07-12Make libvsock available to the virt APEX am: d8fb876292 am: 94cf58be9b am: ↵Jiyong Park
31ae081f41 Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/vsock/+/1762386 Change-Id: I04a39bb8d351f393809bfccb1c978741f6044111
2021-07-12Make libvsock available to the virt APEX am: d8fb876292 am: 94cf58be9bJiyong Park
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/vsock/+/1762386 Change-Id: Ic1600d4cc69c8ef44ecb6d8f9953a16b090ab6d2
2021-07-12Make libvsock available to the virt APEX am: d8fb876292Jiyong Park
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/vsock/+/1762386 Change-Id: If936811e48cf22ce0eaa0721b85899e0c4cd2a71
2021-07-13Make libvsock available to the virt APEXandroid-s-beta-4android-s-beta-3android-s-beta-4Jiyong Park
The library is used by virtualizationservice Bug: 192904048 Test: m com.android.virt Change-Id: Ifadc3319d1c8ce736b406faca3ba7d5491684b4d
2021-06-23Snap for 7482983 from e240b049eb862b60b2218ec31c71b3cbce840776 to tm-releaseAndroid Build Coastguard Worker
Change-Id: I52dbf5de7b88071b0782b4b0bf784de5b67e7156
2021-06-22Upgrade rust/crates/vsock to 0.2.4 am: 38fd0f8001 am: cfac69e54f am: ↵Joel Galenson
1311318f5c am: 7f10f0b79f Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/vsock/+/1742640 Change-Id: I0363f62554539de40eb56201415ebca6464536c2
2021-06-22Upgrade rust/crates/vsock to 0.2.4 am: 38fd0f8001 am: cfac69e54f am: 1311318f5cJoel Galenson
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/vsock/+/1742640 Change-Id: I7edbb6e0662b177c26262e271ff6f23ff78c0939
2021-06-22Upgrade rust/crates/vsock to 0.2.4 am: 38fd0f8001 am: cfac69e54fJoel Galenson
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/vsock/+/1742640 Change-Id: I8af051874a73aa5bb3cc627ce1dcea79954baa24
2021-06-22Upgrade rust/crates/vsock to 0.2.4 am: 38fd0f8001Joel Galenson
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/vsock/+/1742640 Change-Id: I1bbd655ec9ab7abb7221be079fc595dd262c2a6b
2021-06-21Upgrade rust/crates/vsock to 0.2.4Joel Galenson
Test: make Change-Id: I2b8243e2b6b10866c9778ff4d1d3050faee2f62a
2021-06-03Snap for 7418644 from c9c02ffcd6790ae9c3d083e5146e6d917a0efca5 to tm-releaseandroid-build-team Robot
Change-Id: I5e526bc37f77c8366a33e9472b4424cd828984ad
2021-06-02Merge sc-mainline-prodXin Li
Bug: 189946434 Change-Id: I227f259930fd4fe85e3250937dc7ea7f41f4bda3
2021-02-21Snap for 7160100 from bd7a9342512cad61eff8974e68315a0d888ab870 to tm-releaseandroid-build-team Robot
Change-Id: I0db8f34dddf66b065c2f8400d6d6579345debd3e
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 29247806d5 -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: ca3e44dea6 -s ours am: 0e9b7e636c -s ours am skip reason: Change-Id I2de4fb370abca62c82e15c9d16a033d904262939 with SHA-1 7633436d8c is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: If983b5e8e35fc4de1abc334b65df10c630145fad