aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2022-06-30Make available to all APEXs and vendor code am: 362f22471e am: e707e18e23 ↵main-16k-with-phonesAndrew Scull
am: b801eef95b am: 4595ea2e8d Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/scopeguard/+/2141973 Change-Id: I4736d3364f745cdaa296ce83cdf816b70622969e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-30Make available to all APEXs and vendor code am: 362f22471e am: e707e18e23 ↵Andrew Scull
am: b801eef95b Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/scopeguard/+/2141973 Change-Id: I1091387ce0a474dcb3155a6851eb40bf54561303 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-30Make available to all APEXs and vendor code am: 362f22471e am: e707e18e23Andrew Scull
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/scopeguard/+/2141973 Change-Id: Iee88c0206941203eb90218fc4ae79f195672a5b5 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-30Make available to all APEXs and vendor code am: 362f22471emain-16kAndrew Scull
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/scopeguard/+/2141973 Change-Id: If01eb5b6302dbd638b55a8e526f5cc6a4a50c1ee Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-30Make available to all APEXs and vendor codeAndrew Scull
Test: build Change-Id: I3393f93b05e6092eb3d06ab483963679b531e73d
2022-06-15Merge "Update TEST_MAPPING" am: 7b8df87c24 am: 8403246438 am: 54013c2915 am: ↵Treehugger Robot
777f7c586e Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/scopeguard/+/2123477 Change-Id: I1d503afe9cac9bc22dc9deb5b0f594dcd6c03135 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-15Merge "Update TEST_MAPPING" am: 7b8df87c24 am: 8403246438 am: 54013c2915Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/scopeguard/+/2123477 Change-Id: Ie2b7eb73af61da8bbe165d016c1b3f8501456c7d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-15Merge "Update TEST_MAPPING" am: 7b8df87c24 am: 8403246438Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/scopeguard/+/2123477 Change-Id: I7154589d2416a81048ec71493fba4da8bb9c6a2a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-15Merge "Update TEST_MAPPING" am: 7b8df87c24Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/scopeguard/+/2123477 Change-Id: I8725ba8078762d44e95d24f06dea6acd8ad8e900 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: Iffa8d942fed354a3211235c55442e245ab7bd9dd
2022-05-31Update TEST_MAPPING am: 0ae3a44de8 am: 43bba0796f am: 021edda8fc am: 5c2dab030fMatthew Maurer
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/scopeguard/+/2108467 Change-Id: I75443ae0275b1f0980e2205b1ab1f7393ba02173 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-31Update TEST_MAPPING am: 0ae3a44de8 am: 43bba0796f am: 021edda8fcMatthew Maurer
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/scopeguard/+/2108467 Change-Id: Iaea91eb06a81951fdf613a2f2d74fae59fd1f5ea Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-31Update TEST_MAPPING am: 0ae3a44de8 am: 43bba0796fMatthew Maurer
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/scopeguard/+/2108467 Change-Id: I37497a5a169c73dd96f8980376315fd21ef9887b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-31Update TEST_MAPPING am: 0ae3a44de8Matthew Maurer
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/scopeguard/+/2108467 Change-Id: Ib956d4eb1b850c32e3a8b5abd16781b69bdcaafa 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: I883d5ec5093b6f20d5feebb5745793b3dbe8ddd3
2021-12-22Adding bluetooth apex am: e649cfd2fa am: c5b042564c am: 6fac74ad8a am: ↵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_332714010Roopa Sattiraju
e6d805e100 Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/scopeguard/+/1931390 Change-Id: I7ad4dc75da472dd2faee817399a2a8ec8bbdfa80
2021-12-22Adding bluetooth apex am: e649cfd2fa am: c5b042564c am: 6fac74ad8aRoopa Sattiraju
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/scopeguard/+/1931390 Change-Id: I5173f2d548903d5b9533da7348597606473334ab
2021-12-22Adding bluetooth apex am: e649cfd2fa am: c5b042564cRoopa Sattiraju
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/scopeguard/+/1931390 Change-Id: Ib0aed84f0fe180cbee4dfc9481e4daf7dad1fd5e
2021-12-22Adding bluetooth apex am: e649cfd2faRoopa Sattiraju
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/scopeguard/+/1931390 Change-Id: I5a53747d92a30a1ffee3492fe3c01400a9af7dad
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: I4fd541d1b661a7389dcc8c7fd59d8c08fcda4962
2021-12-15Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING." am: c5fbe2e30e ↵Joel Galenson
am: f4ae804b8d am: c3f69300df am: 17362a02d8 Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/scopeguard/+/1912813 Change-Id: Iadda7543781478bf798f9e10d197b19c5790e00e
2021-12-15Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING." am: c5fbe2e30e ↵Joel Galenson
am: f4ae804b8d am: c3f69300df Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/scopeguard/+/1912813 Change-Id: Icb4be9ffb3bcd11ec1bdace7005d7c6923b08fca
2021-12-15Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING." am: c5fbe2e30e ↵Joel Galenson
am: f4ae804b8d Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/scopeguard/+/1912813 Change-Id: Ia84589571039e1270f3d0e99d7febdfdf2a36848
2021-12-15Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING." am: c5fbe2e30eJoel Galenson
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/scopeguard/+/1912813 Change-Id: Ibb741a7bc36278fc763d2e78fc780cf75c330b35
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: Ibbd3fca67fec5cdc95330ce0b32e90f70218018f
2021-10-08Merge "Add apex to scopeguard rust crate" am: 4e5ef60e97 am: 152c7aba9c am: ↵Treehugger Robot
947f24daf9 am: 36ff0118e8 am: 9d316f29c6 Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/scopeguard/+/1850643 Change-Id: I924664a188b2790ee7bbaac537d0c1678d5375be
2021-10-08Merge "Add apex to scopeguard rust crate" am: 4e5ef60e97 am: 152c7aba9c am: ↵Treehugger Robot
947f24daf9 am: 36ff0118e8 Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/scopeguard/+/1850643 Change-Id: I67d21b48bb644c9e48416f3b9e22938702b6d1b2
2021-10-08Merge "Add apex to scopeguard rust crate" am: 4e5ef60e97 am: 152c7aba9c am: ↵Treehugger Robot
947f24daf9 Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/scopeguard/+/1850643 Change-Id: Ib3724c80b9e028d5fc5097478fa60895d34c6552
2021-10-08Merge "Add apex to scopeguard rust crate" am: 4e5ef60e97 am: 152c7aba9cTreehugger Robot
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/scopeguard/+/1850643 Change-Id: I011c925526ca349f122047283cee75da271b457d
2021-10-08Merge "Add apex to scopeguard rust crate" am: 4e5ef60e97Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/scopeguard/+/1850643 Change-Id: I009b3e5483c8c1914d5a63aed4bb36eb64cbfb7f
2021-10-08Merge "Add apex to scopeguard rust crate"android-s-v2-preview-2android-s-v2-preview-1android-s-v2-beta-2android-s-v2-preview-1Treehugger Robot
2021-10-08Add apex to scopeguard rust crateJason Macnak
... for eventually including in crosvm build for Cuttlefish. Bug: 189133053 Test: `m` with vulkano gralloc enabled in crosvm Change-Id: I510ffb658d289cc31bf4de8a4f47709794f24b33
2021-08-24Update TEST_MAPPING am: bd2c5972d7 am: ae8cd72517 am: 2e2498bf57 am: ↵Joel Galenson
6af7f33fbb am: a7b6b9e8f2 Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/scopeguard/+/1806167 Change-Id: I8fec095ebb95ea308e8a40fb1e9905dc9798f370
2021-08-24Update TEST_MAPPING am: bd2c5972d7 am: ae8cd72517 am: 2e2498bf57 am: 6af7f33fbbJoel Galenson
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/scopeguard/+/1806167 Change-Id: I55464e4f30fd8c6b1997f2136d23af30a39a8709
2021-08-24Update TEST_MAPPING am: bd2c5972d7 am: ae8cd72517 am: 2e2498bf57Joel Galenson
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/scopeguard/+/1806167 Change-Id: I42c9a0324a9c9bf42967d9d31e79133b1e7fbfca
2021-08-24Update TEST_MAPPING am: bd2c5972d7 am: ae8cd72517Joel Galenson
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/scopeguard/+/1806167 Change-Id: I8fbf2557b4568138febf194e35f9086996dbeb72
2021-08-24Update TEST_MAPPING am: bd2c5972d7Joel Galenson
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/scopeguard/+/1806167 Change-Id: Ide0fd30401f959c3117f18a2c7a71f783ace1396
2021-08-23Update TEST_MAPPINGandroid-s-beta-5android-s-beta-5Joel Galenson
Test: None Change-Id: Iec4913be7beb472aa95d9c11484e10d04a4c9a55
2021-05-27Merge sc-mainline-prod to master.Bill Rassieur
Change-Id: I2c1c9cd1f5799203d3f7b5f89ff9a59f35f4e58d
2021-05-19Make available to com.android.compos apex am: a58e6cd01b am: 992964e32d am: ↵Victor Hsieh
50fa36f698 Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/scopeguard/+/1705756 Change-Id: Ibcccf0c16b4a0507ea4069d5296e01e845a384e2
2021-05-14Make available to com.android.compos apex am: a58e6cd01b am: 992964e32dVictor Hsieh
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/scopeguard/+/1705756 Change-Id: I41f36535b7c1090de48535805c86135dedbabeb3
2021-05-14Make available to com.android.compos apex am: a58e6cd01bandroid-s-beta-4android-s-beta-3android-s-beta-4Victor Hsieh
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/scopeguard/+/1705756 Change-Id: If16d1ad9fa9351e38ab167f678016dc49c576a14
2021-05-13Make available to com.android.compos apexandroid-s-beta-2android-s-beta-1Victor Hsieh
Bug: 186126404 Test: m Change-Id: I2c274bea28831cbef10ab47b606b198dcc34da83
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 5428f56473 -s ↵Xin Li
ours am: d61ec4c721 -s ours am: f2acc027b9 -s ours am skip reason: Change-Id I6017d049dfe7d4d33e4deaa6f821dcf9c8573f35 with SHA-1 0b68dd31e4 is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ia162badefa37182bc4ebd1fd9f7e9715acbd9a8d
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 5428f56473 -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: d61ec4c721 -s ours am: f2acc027b9 -s ours am skip reason: Change-Id I6017d049dfe7d4d33e4deaa6f821dcf9c8573f35 with SHA-1 0b68dd31e4 is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ic9c0e72c516067601934f1f7377a02086655e78d
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 5428f56473 -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: d61ec4c721 -s ours am skip reason: Change-Id I6017d049dfe7d4d33e4deaa6f821dcf9c8573f35 with SHA-1 0b68dd31e4 is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Iaadf2d967459276fb2bff5f9871fa3e215f0a4e7
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 5428f56473 -s oursXin Li
am skip reason: Change-Id I6017d049dfe7d4d33e4deaa6f821dcf9c8573f35 with SHA-1 0b68dd31e4 is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I4b0e3a227fddaab8eb1f87c920fe3de115bd3f44
2021-02-20Mark ab/7061308 as merged in stage.Xin Li
Bug: 180401296 Merged-In: I6017d049dfe7d4d33e4deaa6f821dcf9c8573f35 Change-Id: Ie6f9cc2e151fe097d56abaf7ba9acffa35b1fb31