summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2022-12-03Snap for 9365220 from 6d04c88672c941fde314c59fd6892d1d9c18b426 to ↵aml_swc_331911000aml_swc_331712000aml_swc_331612000aml_swc_331511000aml_swc_331410000android13-mainline-media-swcodec-releaseAndroid Build Coastguard Worker
mainline-media-swcodec-release Change-Id: I506bcf7ca5f7cda63b4b422fb27e4dca56cf2589
2022-11-28Merge "Hide versioned snapshots from Soong" into tm-mainline-prodTreeHugger Robot
2022-11-26Remove current versioned snapshotPaul Duffin
Versioned snapshots are no longer generated for, or used by, Soong which means that having a versioned snapshot in an Android.bp file processed by Soong is just a waste of resources and prevents all the support for versioned snapshots from being removed from Soong. This change removes the @current versioned instances of the modules from the sdk snapshots. Merged-In specifies the id of a downstream change that updated the module sdk snapshot with one which does not contain @current versioned modules and so does not need to have this change applied. Bug: 260237150 Test: m nothing Merged-In: I1c7ee7882079312a8a10e4ee2509dd424080b6be Change-Id: Ib9e1ec144104e072222bb3d4f7bd77d970cfb456 (cherry picked from commit 491f96456344b7ac72ffcd8620f6099e8411a564) Merged-In: Ib9e1ec144104e072222bb3d4f7bd77d970cfb456
2022-11-26Hide versioned snapshots from SoongPaul Duffin
Versioned snapshots are no longer generated for, or used by, Soong which means that having their Android.bp files processed by Soong is just a waste of resources and prevents all the support for versioned snapshots from being removed from Soong. This change renames the Android.bp file for snapshot version 1 to Android.bp.auto to avoid Soong processing it while preserving it for reference. Bug: 260237150 Test: m nothing Change-Id: Iace56e98679c4bcd404c07ce3903b5db36fac290 (cherry picked from commit ba0d988ced1df6442320aa3f76caa132ffc0bbd4) Merged-In: Iace56e98679c4bcd404c07ce3903b5db36fac290
2022-07-16Snap for 8838244 from dddf6a6a2435fe145ac3bfaf181906cc25ea507a to ↵aml_swc_331318000aml_swc_331116000aml_swc_331012020Android Build Coastguard Worker
mainline-media-swcodec-release Change-Id: I11af16e5e0bde03a6f4fc60839ccd9ab348d4156
2022-07-12DO NOT MERGE Drop prebuilt files to android source tree. am: ef41d73d80Adam Seaton
Original change: https://googleplex-android-review.googlesource.com/c/platform/prebuilts/module_sdk/Wifi/+/19246006 Change-Id: Ib0b1e67139897de580dd6be9d2295195a0e1c110 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-11DO NOT MERGE Drop prebuilt files to android source tree.Adam Seaton
snapshot-creation-build-number.txt Android.bp framework-wifi-removed.txt framework-wifi.srcjar framework-wifi_annotations.zip framework-wifi.txt framework-wifi-stubs.jar framework-wifi-removed.txt framework-wifi.srcjar framework-wifi_annotations.zip framework-wifi.txt framework-wifi-stubs.jar framework-wifi-removed.txt framework-wifi.srcjar framework-wifi_annotations.zip framework-wifi.txt framework-wifi-stubs.jar LICENSE index.csv hiddenapi-max-target-r-low-priority.txt filtered-stub-flags.csv hiddenapi-max-target-o-low-priority.txt annotation-flags.csv metadata.csv hiddenapi-unsupported.txt filtered-flags.csv signature-patterns.csv service-wifi.jar Built here: ab/T1004342 This build IS suitable for public release. The change is generated with prebuilt drop tool. Test: presubmit Change-Id: I8c69fb510e2c5713eaea5a79f9a8683ef98a9213
2022-07-09Snap for 8814336 from d742783a463713538b36d4cf79d9aeb667a9f62f to ↵Android Build Coastguard Worker
mainline-media-swcodec-release Change-Id: I76ebd8deaa83c31473d84785a452b9b0a3c05821
2022-07-07DO NOT MERGE Drop prebuilt files to android source tree. am: afaff5b1a9Adam Seaton
Original change: https://googleplex-android-review.googlesource.com/c/platform/prebuilts/module_sdk/Wifi/+/19211511 Change-Id: Ib21937f49fdf0c32aaf765556f28574bd2750305 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-07DO NOT MERGE Drop prebuilt files to android source tree.Adam Seaton
snapshot-creation-build-number.txt Android.bp framework-wifi-removed.txt framework-wifi.srcjar framework-wifi_annotations.zip framework-wifi.txt framework-wifi-stubs.jar framework-wifi-removed.txt framework-wifi.srcjar framework-wifi_annotations.zip framework-wifi.txt framework-wifi-stubs.jar framework-wifi-removed.txt framework-wifi.srcjar framework-wifi_annotations.zip framework-wifi.txt framework-wifi-stubs.jar LICENSE index.csv hiddenapi-max-target-r-low-priority.txt filtered-stub-flags.csv hiddenapi-max-target-o-low-priority.txt annotation-flags.csv metadata.csv hiddenapi-unsupported.txt filtered-flags.csv signature-patterns.csv service-wifi.jar Built here: ab/T1004315 This build IS suitable for public release. The change is generated with prebuilt drop tool. Test: presubmit Bug: 237121173 Change-Id: I97676e82c94812e5532d9fca76fecaae80218ec0
2022-07-02Snap for 8793895 from 712e785bc9aef2a06ebbdc24efa5d9ef7b0946f1 to ↵Android Build Coastguard Worker
mainline-media-swcodec-release Change-Id: I0aa9e963e90d16a28d84b3f059509ffffc6fd789
2022-06-30DO NOT MERGE Drop prebuilt files to android source tree. am: 2f7d4ec572Bob Hanji
Original change: https://googleplex-android-review.googlesource.com/c/platform/prebuilts/module_sdk/Wifi/+/19099681 Change-Id: Ie5c7a3b2a69885394d965290c95e8664f1717b8a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-28DO NOT MERGE Drop prebuilt files to android source tree.Bob Hanji
Android.bp snapshot-creation-build-number.txt framework-wifi-stubs.jar framework-wifi_annotations.zip framework-wifi.srcjar framework-wifi.txt framework-wifi-removed.txt framework-wifi-stubs.jar framework-wifi_annotations.zip framework-wifi.srcjar framework-wifi.txt framework-wifi-removed.txt framework-wifi-stubs.jar framework-wifi_annotations.zip framework-wifi.srcjar framework-wifi.txt framework-wifi-removed.txt service-wifi.jar LICENSE filtered-flags.csv metadata.csv filtered-stub-flags.csv hiddenapi-max-target-r-low-priority.txt hiddenapi-max-target-o-low-priority.txt hiddenapi-unsupported.txt index.csv signature-patterns.csv annotation-flags.csv Built here: ab/T1004275 This build IS suitable for public release. The change is generated with prebuilt drop tool. Test: presubmit Bug: 235705094 Change-Id: I2a207df15a5819c03383a0cd670aa3c94d2ef2ae
2022-06-25Snap for 8769705 from 5f8e5a01ede7eb3814ae681dd5d2a3d3982ca05d to ↵Android Build Coastguard Worker
mainline-media-swcodec-release Change-Id: Iae152f9bec7d1611fa4f0d503d3ba62af29e6164
2022-06-22DO NOT MERGE Drop prebuilt files to android source tree. am: 704adcf845Bob Hanji
Original change: https://googleplex-android-review.googlesource.com/c/platform/prebuilts/module_sdk/Wifi/+/19030296 Change-Id: I6b2026862ca2682c721ab0102821682e041811a4 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-22DO NOT MERGE Drop prebuilt files to android source tree.android13-devBob Hanji
Android.bp snapshot-creation-build-number.txt framework-wifi-stubs.jar framework-wifi_annotations.zip framework-wifi.srcjar framework-wifi.txt framework-wifi-removed.txt framework-wifi-stubs.jar framework-wifi_annotations.zip framework-wifi.srcjar framework-wifi.txt framework-wifi-removed.txt framework-wifi-stubs.jar framework-wifi_annotations.zip framework-wifi.srcjar framework-wifi.txt framework-wifi-removed.txt service-wifi.jar LICENSE filtered-flags.csv metadata.csv filtered-stub-flags.csv hiddenapi-max-target-r-low-priority.txt hiddenapi-max-target-o-low-priority.txt hiddenapi-unsupported.txt index.csv signature-patterns.csv annotation-flags.csv Built here: ab/T1004231 This build IS suitable for public release. The change is generated with prebuilt drop tool. Test: presubmit Bug: 235705094 Change-Id: I5c30179a39f033b24e27bb9473c70208e47abff2
2022-06-18Snap for 8742590 from b92c25e316988a66678d1c484e1db36a666a5c02 to ↵Android Build Coastguard Worker
mainline-media-swcodec-release Change-Id: I5b0da7276055a8d3481056cbce65713556617f38
2022-06-15DO NOT MERGE Drop prebuilt files to android source tree. am: 2ecfac0bb0Adam Seaton
Original change: https://googleplex-android-review.googlesource.com/c/platform/prebuilts/module_sdk/Wifi/+/18909775 Change-Id: I8c80931e2196cec48656be6c054d7dc675cdff77 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-15DO NOT MERGE Drop prebuilt files to android source tree.Adam Seaton
snapshot-creation-build-number.txt Android.bp framework-wifi-removed.txt framework-wifi.srcjar framework-wifi_annotations.zip framework-wifi.txt framework-wifi-stubs.jar framework-wifi-removed.txt framework-wifi.srcjar framework-wifi_annotations.zip framework-wifi.txt framework-wifi-stubs.jar framework-wifi-removed.txt framework-wifi.srcjar framework-wifi_annotations.zip framework-wifi.txt framework-wifi-stubs.jar LICENSE index.csv hiddenapi-max-target-r-low-priority.txt filtered-stub-flags.csv hiddenapi-max-target-o-low-priority.txt annotation-flags.csv metadata.csv hiddenapi-unsupported.txt filtered-flags.csv signature-patterns.csv service-wifi.jar Built here: ab/T1004196 This build IS suitable for public release. The change is generated with prebuilt drop tool. Test: presubmit Bug: 235705094 Change-Id: I0d63561d03594986e71d67599028f9b51414d542
2022-06-11Snap for 8712255 from 218847549962a28aba76c388803ef4a86da1a755 to ↵Android Build Coastguard Worker
mainline-media-swcodec-release Change-Id: I30e5cd317d6d6bdeb1daa43edfb3ab35b7583d13
2022-06-10Finalize artifacts for extension SDK 3 am: 8f6d2225e0Anton Hansson
Original change: https://googleplex-android-review.googlesource.com/c/platform/prebuilts/module_sdk/Wifi/+/18816334 Change-Id: Ifd4b07d16eddc78d7e281adc1b6519105eeb4f34 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-10Finalize artifacts for extension SDK 3Anton Hansson
Import from build id 8636759. Generated with: $ packages/modules/common/tools/finalize_sdk.py -b 232810284 -f 3 8636759 Bug: 232810284 Test: presubmit Change-Id: Ia9879a24de609647b72bcceefb390e53445b0626
2022-06-09Snap for 8700776 from 7d804aa2722579155e8d5cfd511c204acc9f61e1 to ↵Android Build Coastguard Worker
mainline-media-swcodec-release Change-Id: Ic00f8b9504f2603d1a8897b31fa3daca5348d38e
2022-06-07DO NOT MERGE Drop prebuilt files to android source tree. am: f54fbe3e13Adam Seaton
Original change: https://googleplex-android-review.googlesource.com/c/platform/prebuilts/module_sdk/Wifi/+/18775114 Change-Id: I798f0ab94b464a9c47d610aa377fe02e1a4dbb83 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-07DO NOT MERGE Drop prebuilt files to android source tree.Adam Seaton
snapshot-creation-build-number.txt Android.bp framework-wifi-removed.txt framework-wifi.srcjar framework-wifi_annotations.zip framework-wifi.txt framework-wifi-stubs.jar framework-wifi-removed.txt framework-wifi.srcjar framework-wifi_annotations.zip framework-wifi.txt framework-wifi-stubs.jar framework-wifi-removed.txt framework-wifi.srcjar framework-wifi_annotations.zip framework-wifi.txt framework-wifi-stubs.jar LICENSE index.csv hiddenapi-max-target-r-low-priority.txt filtered-stub-flags.csv hiddenapi-max-target-o-low-priority.txt annotation-flags.csv metadata.csv hiddenapi-unsupported.txt filtered-flags.csv signature-patterns.csv service-wifi.jar Built here: ab/T1004135 This build IS suitable for public release. The change is generated with prebuilt drop tool. Test: presubmit Bug: 235212699 Change-Id: I1ebc0b9d8de5018684d947163067f0d3b1175963
2022-06-04Snap for 8683397 from 8630f0eb2a20b3edcd246043a8eba210b0e98c07 to ↵Android Build Coastguard Worker
mainline-media-swcodec-release Change-Id: I834e185a3db374414a85036fd1de09f1b6c1317e
2022-06-02DO NOT MERGE Drop prebuilt files to android source tree. am: dcbbd609e5Adam Seaton
Original change: https://googleplex-android-review.googlesource.com/c/platform/prebuilts/module_sdk/Wifi/+/18707068 Change-Id: Iaad685ddee36e2d034477d195aaa90d29f302545 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-02DO NOT MERGE Drop prebuilt files to android source tree.Adam Seaton
snapshot-creation-build-number.txt Android.bp framework-wifi-removed.txt framework-wifi.srcjar framework-wifi_annotations.zip framework-wifi.txt framework-wifi-stubs.jar framework-wifi-removed.txt framework-wifi.srcjar framework-wifi_annotations.zip framework-wifi.txt framework-wifi-stubs.jar framework-wifi-removed.txt framework-wifi.srcjar framework-wifi_annotations.zip framework-wifi.txt framework-wifi-stubs.jar LICENSE index.csv hiddenapi-max-target-r-low-priority.txt filtered-stub-flags.csv hiddenapi-max-target-o-low-priority.txt annotation-flags.csv metadata.csv hiddenapi-unsupported.txt filtered-flags.csv signature-patterns.csv service-wifi.jar Built here: ab/T1004113 This build IS suitable for public release. The change is generated with prebuilt drop tool. Test: presubmit Bug: 234586662 Change-Id: I64770157c689a578d33cdd7f421d8daebec6bce9
2022-05-28Snap for 8657776 from 983e3b48b8cdf2323fa3652ccb69fc16cb68e8a9 to ↵Android Build Coastguard Worker
mainline-media-swcodec-release Change-Id: Ic71d5445a932d99a468f8fdc1407dd10b50a536d
2022-05-23Drop prebuilt files to android source tree. am: cf05d49ea4satayev
Original change: https://googleplex-android-review.googlesource.com/c/platform/prebuilts/module_sdk/Wifi/+/18557850 Change-Id: Ie5ce37b63e4fdd0caad5410b65cb81ad0056ef05 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-23Drop prebuilt files to android source tree.satayev
snapshot-creation-build-number.txt Android.bp LICENSE framework-wifi-removed.txt framework-wifi.srcjar framework-wifi.txt framework-wifi_annotations.zip framework-wifi-stubs.jar framework-wifi-removed.txt framework-wifi.srcjar framework-wifi.txt framework-wifi_annotations.zip framework-wifi-stubs.jar framework-wifi-removed.txt framework-wifi.srcjar framework-wifi.txt framework-wifi_annotations.zip framework-wifi-stubs.jar service-wifi.jar hiddenapi-unsupported.txt hiddenapi-max-target-r-low-priority.txt metadata.csv signature-patterns.csv filtered-stub-flags.csv filtered-flags.csv index.csv annotation-flags.csv hiddenapi-max-target-o-low-priority.txt Built here: ab/T1004067 This build IS suitable for public release. The change is generated with prebuilt drop tool. Test: presubmit Bug: 223592962 Change-Id: I6436faba3884fb8258bebe1251168b1e3a3123c9
2022-05-20Snap for 8618784 from b9d8f467145fc2b08b9ecf052ad67d90c5675e16 to ↵Android Build Coastguard Worker
mainline-media-swcodec-release Change-Id: I6f88745f0967c40e38f19d9b272e12f8ac3020b7
2022-05-19Drop prebuilt files to android source tree. am: 68860fbb8dsatayev
Original change: https://googleplex-android-review.googlesource.com/c/platform/prebuilts/module_sdk/Wifi/+/18491847 Change-Id: I46150f8d34be13e6530263883376a8027b896dd6 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-19Drop prebuilt files to android source tree.satayev
snapshot-creation-build-number.txt Android.bp LICENSE framework-wifi-removed.txt framework-wifi.srcjar framework-wifi.txt framework-wifi_annotations.zip framework-wifi-stubs.jar framework-wifi-removed.txt framework-wifi.srcjar framework-wifi.txt framework-wifi_annotations.zip framework-wifi-stubs.jar framework-wifi-removed.txt framework-wifi.srcjar framework-wifi.txt framework-wifi_annotations.zip framework-wifi-stubs.jar service-wifi.jar hiddenapi-unsupported.txt hiddenapi-max-target-r-low-priority.txt metadata.csv signature-patterns.csv filtered-stub-flags.csv filtered-flags.csv index.csv annotation-flags.csv hiddenapi-max-target-o-low-priority.txt Built here: ab/T1004024 This build IS suitable for public release. The change is generated with prebuilt drop tool. Test: presubmit Bug: 223592962 Change-Id: I845e326e3a1a59220db0832282f2b8de3025b3e3
2022-05-17Snap for 8605252 from 51067ce663252061aa22dd19199d88660d4c2009 to ↵Android Build Coastguard Worker
mainline-media-swcodec-release Change-Id: I03099116f721bd1c3725c6d1fc83ab941b7b183a
2022-05-16Drop prebuilt files to android source tree. am: 862b2765c5satayev
Original change: https://googleplex-android-review.googlesource.com/c/platform/prebuilts/module_sdk/Wifi/+/18375412 Change-Id: I934a0c77bf3a2dfc52739e19d65afddfc95d2098 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-13Drop prebuilt files to android source tree.satayev
snapshot-creation-build-number.txt Android.bp LICENSE framework-wifi-removed.txt framework-wifi.srcjar framework-wifi.txt framework-wifi_annotations.zip framework-wifi-stubs.jar framework-wifi-removed.txt framework-wifi.srcjar framework-wifi.txt framework-wifi_annotations.zip framework-wifi-stubs.jar framework-wifi-removed.txt framework-wifi.srcjar framework-wifi.txt framework-wifi_annotations.zip framework-wifi-stubs.jar service-wifi.jar hiddenapi-unsupported.txt hiddenapi-max-target-r-low-priority.txt metadata.csv signature-patterns.csv filtered-stub-flags.csv filtered-flags.csv index.csv annotation-flags.csv hiddenapi-max-target-o-low-priority.txt Built here: ab/T1003987 This build IS suitable for preview release but IS NOT suitable for public release. The change is generated with prebuilt drop tool. Test: presubmit Bug: 223592962 Change-Id: I5f0a99f080d9d2978c94f212d0b1b3448f8b5c83
2022-05-11Snap for 8570526 from e49a9dae4b6ceaaa87ddad01bf890754ac71b96e to ↵Android Build Coastguard Worker
mainline-media-swcodec-release Change-Id: Ia77095590ff35d3285746d83c9593d671b1e005a
2022-05-02Add Android.bp.auto for extension SDK 3 am: c683f79207Anton Hansson
Original change: https://googleplex-android-review.googlesource.com/c/platform/prebuilts/module_sdk/Wifi/+/18031644 Change-Id: I64f8f095cb7efe3329a9b9fa4b5d883d11f9c348 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-28Add Android.bp.auto for extension SDK 3Anton Hansson
Import from build id 8501766. Generated with: $ packages/modules/common/tools/finalize_sdk.py -b 222050148 -f 3 8501766 Bug: 222050148 Test: presubmit Change-Id: If0c21fd743e2873cade5a20fe198a817f479fab0
2022-04-27Finalize artifacts for extension SDK 3 am: e1489949bbYurii Zubrytskyi
Original change: https://googleplex-android-review.googlesource.com/c/platform/prebuilts/module_sdk/Wifi/+/17963299 Change-Id: I5206236abfa4966edd5455c4b4c6367b50ced081 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-27Finalize artifacts for extension SDK 3Yurii Zubrytskyi
Import from build id 8501766. Generated with: $ packages/modules/common/tools/finalize_sdk.py -b 225745567 -f 3 -bn Tiramisu-SDK-Finalization-sdk 8501766 Bug: 225745567 Test: presubmit Change-Id: I78f32522306aec91f2d4395364de5c95fbcf3850 Merged-In: I78f32522306aec91f2d4395364de5c95fbcf3850
2022-04-03[automerger skipped] Merge Android 12 QPR3 ab/8391262 am: 5093e6d7a2 -s ours ↵Xin Li
am: a360aa6ff9 -s ours am: 18c6562a6f -s ours am skip reason: Merged-In I8016aa622b5f8a4c6fca11571845e8a31f4f7322 with SHA-1 927ed9a4f1 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/prebuilts/module_sdk/Wifi/+/17545210 Change-Id: I8719d915f7ea990e76d1ef85b16b2eefeeecf581 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-03[automerger skipped] Merge Android 12 QPR3 ab/8391262 am: 5093e6d7a2 -s ours ↵Xin Li
am: a360aa6ff9 -s ours am skip reason: Merged-In I8016aa622b5f8a4c6fca11571845e8a31f4f7322 with SHA-1 927ed9a4f1 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/prebuilts/module_sdk/Wifi/+/17545210 Change-Id: I91fa92d0931ee5e7328fd6dafbd5f90a5c68a923 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-03[automerger skipped] Merge Android 12 QPR3 ab/8391262 am: 5093e6d7a2 -s oursXin Li
am skip reason: Merged-In I8016aa622b5f8a4c6fca11571845e8a31f4f7322 with SHA-1 927ed9a4f1 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/prebuilts/module_sdk/Wifi/+/17545210 Change-Id: I0484cb78b1c98a149a890c28ce0737fc58b56111 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-01Merge Android 12 QPR3 ab/8391262Xin Li
Bug: 226662282 Merged-In: I8016aa622b5f8a4c6fca11571845e8a31f4f7322 Change-Id: Ie8b9383e6eb8b7843855c1d5ad2adb294f0ace09
2022-03-09[automerger skipped] Merge Android 12L am: 3e395f7454 -s ours am: 3a89d6278e ↵Xin Li
-s ours am: 927ed9a4f1 -s ours am: 8bcd186b30 -s ours am skip reason: Merged-In If11cffc2b37f0868ff178d95a9f946700cb59ba0 with SHA-1 1a57825040 is already in history Original change: https://android-review.googlesource.com/c/platform/prebuilts/module_sdk/Wifi/+/2013174 Change-Id: I512374b4e4f865f7561d74b368c7f2982f8dd60f
2022-03-09[automerger skipped] Merge Android 12L am: 3e395f7454 -s ours am: 3a89d6278e ↵Xin Li
-s ours am: 927ed9a4f1 -s ours am skip reason: Merged-In If11cffc2b37f0868ff178d95a9f946700cb59ba0 with SHA-1 1a57825040 is already in history Original change: https://android-review.googlesource.com/c/platform/prebuilts/module_sdk/Wifi/+/2013174 Change-Id: I74e8ca6c10280a7f24db9f4765b85665d32ce48b
2022-03-08[automerger skipped] Merge Android 12L am: 3e395f7454 -s ours am: 3a89d6278e ↵Xin Li
-s ours am skip reason: Merged-In If11cffc2b37f0868ff178d95a9f946700cb59ba0 with SHA-1 1a57825040 is already in history Original change: https://android-review.googlesource.com/c/platform/prebuilts/module_sdk/Wifi/+/2013174 Change-Id: I8016aa622b5f8a4c6fca11571845e8a31f4f7322
2022-03-08[automerger skipped] Merge Android 12L am: 3e395f7454 -s oursXin Li
am skip reason: Merged-In If11cffc2b37f0868ff178d95a9f946700cb59ba0 with SHA-1 1a57825040 is already in history Original change: https://android-review.googlesource.com/c/platform/prebuilts/module_sdk/Wifi/+/2013174 Change-Id: I62b245fea118a8b7433fc63c82b71a68b89301fc