aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2022-02-17Snap for 8191477 from ab58af3f2f89628d59178a8e2bf7f462be01f3d7 to ↵t_frc_net_330443000android13-frc-networking-releaseAndroid Build Coastguard Worker
tm-frc-networking-release Change-Id: If70d482f4fbfb1b1a602908e33e64315bf988e0b
2022-02-16Snap for 8189365 from a0e8441caa9c66ecbbede61803f7a1a2f10a4084 to ↵Android Build Coastguard Worker
tm-frc-networking-release Change-Id: I6587748922634e58133ec3bb8e62c11ead77eb44
2021-08-20Load no-mcc-mnc config for carriers w/o configs am: 80d87d3339 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_332714010Jared Tsai
f833ffce02 am: e9a236058e am: 7737d4ae48 am: fde4d90213 Original change: https://android-review.googlesource.com/c/platform/tools/carrier_settings/+/1798187 Change-Id: I8ba339a77c66fe2512f8358ecbce639b1558956a
2021-08-20Load no-mcc-mnc config for carriers w/o configs am: 80d87d3339 am: ↵Jared Tsai
f833ffce02 am: e9a236058e am: 7737d4ae48 Original change: https://android-review.googlesource.com/c/platform/tools/carrier_settings/+/1798187 Change-Id: I7b62d72ff4022e520ea2598149fb48b544d52049
2021-08-20Load no-mcc-mnc config for carriers w/o configs am: 80d87d3339 am: ↵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-1Jared Tsai
f833ffce02 am: e9a236058e Original change: https://android-review.googlesource.com/c/platform/tools/carrier_settings/+/1798187 Change-Id: I2634e3834788f6624e76e777690523db2f099308
2021-08-20Load no-mcc-mnc config for carriers w/o configs am: 80d87d3339 am: f833ffce02Jared Tsai
Original change: https://android-review.googlesource.com/c/platform/tools/carrier_settings/+/1798187 Change-Id: I80a2cbe1e98c4f62cfd34bea7d023c6f54a814b4
2021-08-20Load no-mcc-mnc config for carriers w/o configs am: 80d87d3339android-s-v2-preview-2android-s-v2-preview-1android-s-v2-beta-2android-s-v2-preview-1Jared Tsai
Original change: https://android-review.googlesource.com/c/platform/tools/carrier_settings/+/1798187 Change-Id: I258db2c9788acad09752f0b30f89c791940fc293
2021-08-18Load no-mcc-mnc config for carriers w/o configsandroid-s-beta-5android-s-beta-5Jared Tsai
Issue: when carrier config for mcc/mnc 000/000 doesn't exist, no-mcc-mnc config in vendor.xml is not applied to carriers w/o any customized configs in assets or vendor.xml. Solution: Generate a 000/000 carrier if no-mcc-mnc config exists in vendor.xml, so no-mcc-mnc config will be applied as the default config for carriers without configs. Bug: 181589307 Change-Id: Id2868f4469167834f928d915217803c5ab353b37
2021-06-02Merge sc-mainline-prodXin Li
Bug: 189946434 Change-Id: I438df56ec7b1004712702eb2f770d73b47224fdc
2021-05-17Align the handling of no-mcc-mnc configs in vendor.xml with carrierconfig ↵Meng Wang
app am: 4fc47e4a1f am: 5dd439e18d am: 29bb818b42 am: 50d35183ef am: 8387b499c9 am: e86e300479 Original change: https://android-review.googlesource.com/c/platform/tools/carrier_settings/+/1690689 Change-Id: Icc721dfa6ded3975b011edf6cbeaca8ff61f20f6
2021-05-17Align the handling of no-mcc-mnc configs in vendor.xml with carrierconfig ↵Meng Wang
app am: 4fc47e4a1f am: 5dd439e18d am: 29bb818b42 am: 50d35183ef am: 4025d5dab4 am: 951a57d062 Original change: https://android-review.googlesource.com/c/platform/tools/carrier_settings/+/1690689 Change-Id: I65a3e1b47f8d24759f45cc9dbba7f7608bd008aa
2021-05-16Fix typo in GenDeviceSettings am: ce9f1fd99a am: d99637d691 am: b2ac9e97b0 ↵Chi Zhang
am: 67b2b14a89 am: 89e7e09e28 Original change: https://android-review.googlesource.com/c/platform/tools/carrier_settings/+/1680687 Change-Id: Ib54dc04d8053fb48d7b2ea5d928b3e832117438b
2021-05-16Align the handling of no-mcc-mnc configs in vendor.xml with carrierconfig ↵Meng Wang
app am: 4fc47e4a1f am: 5dd439e18d am: 29bb818b42 am: 50d35183ef am: 8387b499c9 Original change: https://android-review.googlesource.com/c/platform/tools/carrier_settings/+/1690689 Change-Id: I6e001bbb8d1cef3df9550231eaa8c6ac4d6daba5
2021-04-30Align the handling of no-mcc-mnc configs in vendor.xml with carrierconfig ↵Meng Wang
app am: 4fc47e4a1f am: 5dd439e18d am: 29bb818b42 am: 50d35183ef am: 4025d5dab4 Original change: https://android-review.googlesource.com/c/platform/tools/carrier_settings/+/1690689 Change-Id: I412db157096bbf55e37cc5a76514da52d2181d17
2021-04-30Align the handling of no-mcc-mnc configs in vendor.xml with carrierconfig ↵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-releaseMeng Wang
app am: 4fc47e4a1f am: 5dd439e18d am: 29bb818b42 am: 50d35183ef Original change: https://android-review.googlesource.com/c/platform/tools/carrier_settings/+/1690689 Change-Id: I40f76f88abc73ae4dc43eb6e23be005cf2158d55
2021-04-30Align the handling of no-mcc-mnc configs in vendor.xml with carrierconfig ↵android-mainline-12.0.0_r99android-mainline-12.0.0_r98android-mainline-12.0.0_r77android-mainline-12.0.0_r70android-mainline-12.0.0_r69android-mainline-12.0.0_r63android-mainline-12.0.0_r59android-mainline-12.0.0_r56android-mainline-12.0.0_r5android-mainline-12.0.0_r49android-mainline-12.0.0_r42android-mainline-12.0.0_r39android-mainline-12.0.0_r22android-mainline-12.0.0_r19android-mainline-12.0.0_r122android-mainline-12.0.0_r115android-mainline-12.0.0_r113android-mainline-12.0.0_r100aml_tz3_311312010android12-mainline-networkstack-releaseandroid12-mainline-art-releaseMeng Wang
app am: 4fc47e4a1f am: 5dd439e18d am: 29bb818b42 am: 50d35183ef Original change: https://android-review.googlesource.com/c/platform/tools/carrier_settings/+/1690689 Change-Id: Ic14f75a4bb93eae9c7f63d5d4f6d1fc64c1dd18e
2021-04-30Align the handling of no-mcc-mnc configs in vendor.xml with carrierconfig ↵Meng Wang
app am: 4fc47e4a1f am: 5dd439e18d am: 29bb818b42 am: 50d35183ef Original change: https://android-review.googlesource.com/c/platform/tools/carrier_settings/+/1690689 Change-Id: I0b6ee4d2b13422c5c6d25a3b8506d6dabb9c22b3
2021-04-30Align the handling of no-mcc-mnc configs in vendor.xml with carrierconfig ↵Meng Wang
app am: 4fc47e4a1f am: 5dd439e18d am: 29bb818b42 am: 50d35183ef Original change: https://android-review.googlesource.com/c/platform/tools/carrier_settings/+/1690689 Change-Id: I2bba9a3320c518c725161b33849bd47ee9a68366
2021-04-30Align the handling of no-mcc-mnc configs in vendor.xml with carrierconfig ↵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-devMeng Wang
app am: 4fc47e4a1f am: 5dd439e18d am: 29bb818b42 Original change: https://android-review.googlesource.com/c/platform/tools/carrier_settings/+/1690689 Change-Id: I0943cd82e74a0bb84c33ad4a81664a5babee4d89
2021-04-30Align the handling of no-mcc-mnc configs in vendor.xml with carrierconfig ↵Meng Wang
app am: 4fc47e4a1f am: 5dd439e18d Original change: https://android-review.googlesource.com/c/platform/tools/carrier_settings/+/1690689 Change-Id: Ie233cd0049a2cdfe83a7b62eb4fe5bd631dee80f
2021-04-30Align the handling of no-mcc-mnc configs in vendor.xml with carrierconfig ↵android-s-beta-4android-s-beta-3android-s-beta-4Meng Wang
app am: 4fc47e4a1f Original change: https://android-review.googlesource.com/c/platform/tools/carrier_settings/+/1690689 Change-Id: Ifc1327c6323a689bd41007374641a1aaa089decb
2021-04-29Align the handling of no-mcc-mnc configs in vendor.xml with carrierconfig appandroid-s-beta-2android-s-beta-1Meng Wang
Bug: 186172788 Test: manual Change-Id: I99f3be6c3f241ce947cf1b7727be0452fa28221d
2021-04-20Fix typo in GenDeviceSettings am: ce9f1fd99a am: d99637d691 am: b2ac9e97b0 ↵Chi Zhang
am: 67b2b14a89 Original change: https://android-review.googlesource.com/c/platform/tools/carrier_settings/+/1680687 Change-Id: I28cedf014f48cd0282487f903e624831ef25ef3c
2021-04-20Fix typo in GenDeviceSettings am: ce9f1fd99a am: d99637d691 am: b2ac9e97b0 ↵Chi Zhang
am: 67b2b14a89 Original change: https://android-review.googlesource.com/c/platform/tools/carrier_settings/+/1680687 Change-Id: I9ffa6b3c92a5fc4e220002e746e114d46570c2f2
2021-04-20Fix typo in GenDeviceSettings am: ce9f1fd99a am: d99637d691 am: b2ac9e97b0 ↵Chi Zhang
am: 67b2b14a89 Original change: https://android-review.googlesource.com/c/platform/tools/carrier_settings/+/1680687 Change-Id: I351bb4d98b398fc75f94589977d6281196a75cad
2021-04-20Fix typo in GenDeviceSettings am: ce9f1fd99a am: d99637d691 am: b2ac9e97b0Chi Zhang
Original change: https://android-review.googlesource.com/c/platform/tools/carrier_settings/+/1680687 Change-Id: I690338f2444a6745e91b344e2d16c01fb8ed02ef
2021-04-20Fix typo in GenDeviceSettings am: ce9f1fd99a am: d99637d691Chi Zhang
Original change: https://android-review.googlesource.com/c/platform/tools/carrier_settings/+/1680687 Change-Id: I13441da5653e6de2e367187a0fa8f154ed41949d
2021-04-20Fix typo in GenDeviceSettings am: ce9f1fd99aChi Zhang
Original change: https://android-review.googlesource.com/c/platform/tools/carrier_settings/+/1680687 Change-Id: I80f86a46070c0004ea967eed9efaa47274011e45
2021-04-20Fix typo in GenDeviceSettingsChi Zhang
Change-Id: Icbf5dc576ad694f83be526f24c7aacae7117c798
2021-03-19Add carrier config for not reusing MNO APNs for MVNOs am: 015de26ab2 am: ↵Jing Zhao
feea844ce5 am: d071c0b1d3 am: 846fa3c618 Original change: https://android-review.googlesource.com/c/platform/tools/carrier_settings/+/1639540 Change-Id: I9f73274572594b834a757a65b5f44cb3ed2a2624
2021-03-19Add carrier config for not reusing MNO APNs for MVNOs am: 015de26ab2 am: ↵Jing Zhao
feea844ce5 am: d071c0b1d3 am: 846fa3c618 Original change: https://android-review.googlesource.com/c/platform/tools/carrier_settings/+/1639540 Change-Id: I48ee1d0746f54fd6b613b9da569264a433582bea
2021-03-19Add carrier config for not reusing MNO APNs for MVNOs am: 015de26ab2 am: ↵Jing Zhao
feea844ce5 am: d071c0b1d3 Original change: https://android-review.googlesource.com/c/platform/tools/carrier_settings/+/1639540 Change-Id: I417752c605e413debba6cb64092e5cd3007caf5a
2021-03-19Add carrier config for not reusing MNO APNs for MVNOs am: 015de26ab2 am: ↵Jing Zhao
feea844ce5 Original change: https://android-review.googlesource.com/c/platform/tools/carrier_settings/+/1639540 Change-Id: I280c97a73f7266009cbaca5c35db769519764baf
2021-03-19Add carrier config for not reusing MNO APNs for MVNOs am: 015de26ab2Jing Zhao
Original change: https://android-review.googlesource.com/c/platform/tools/carrier_settings/+/1639540 Change-Id: I565031058543ed82414ab8780c8c8569da541167
2021-03-18Add carrier config for not reusing MNO APNs for MVNOsJing Zhao
In case we do not need any APN for a MVNO, config carriersettingstool.no_apn_for_mvno_bool to change the default tool behavior Change-Id: Ib42e577ac8695206c345883e0a7b3f24d7a4e028
2021-03-12CarrierSettings Conversion Tool : Support RCS APN Type am: 0a2c3b9ec4 am: ↵Jing Zhao
c57a674b84 am: 9b4ff66703 am: 8efa9f1078 Original change: https://android-review.googlesource.com/c/platform/tools/carrier_settings/+/1631918 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ia8427f009e157ad935453d4c649db8866e251216
2021-03-12CarrierSettings Conversion Tool : Support RCS APN Type am: 0a2c3b9ec4 am: ↵Jing Zhao
c57a674b84 am: 9b4ff66703 am: 8efa9f1078 Original change: https://android-review.googlesource.com/c/platform/tools/carrier_settings/+/1631918 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Id93db7463043a7deefe429cee93fa3674ba16833
2021-03-12CarrierSettings Conversion Tool : Support RCS APN Type am: 0a2c3b9ec4 am: ↵Jing Zhao
c57a674b84 am: 9b4ff66703 Original change: https://android-review.googlesource.com/c/platform/tools/carrier_settings/+/1631918 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I3c77d2fe79b808e6d6b3b54c1b586a9d6a74ff91
2021-03-12CarrierSettings Conversion Tool : Support RCS APN Type am: 0a2c3b9ec4 am: ↵Jing Zhao
c57a674b84 Original change: https://android-review.googlesource.com/c/platform/tools/carrier_settings/+/1631918 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I6c7af35cf0f9a1563ad4373d8990a46f6484d48f
2021-03-12CarrierSettings Conversion Tool : Support RCS APN Type am: 0a2c3b9ec4Jing Zhao
Original change: https://android-review.googlesource.com/c/platform/tools/carrier_settings/+/1631918 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ie1b908ebe3b0d796d4c7f65800c9aa0350893cf0
2021-03-12CarrierSettings Conversion Tool : Support RCS APN TypeJing Zhao
Root Cause: MTK additional APN type RCS need to be supported by CarrierSettings Solution: Make change to conversion tool to support RCS type Change-Id: I3e101791a7234d20d123b7dd0c093ca7a14ac715
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: d4890b7bc5 -s ↵Xin Li
ours am: d96fcb19ab -s ours am: 5da0faf8bd -s ours am skip reason: Change-Id Ida58f2c362f40266e64700d2695d9798d2a08a8c with SHA-1 612c6ec701 is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Id296adea22d34b07942ae4fc34add2bcb560749b
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: d4890b7bc5 -s ↵Xin Li
ours am: d96fcb19ab -s ours am: 5da0faf8bd -s ours am skip reason: Change-Id Ida58f2c362f40266e64700d2695d9798d2a08a8c with SHA-1 612c6ec701 is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ib64253c65bbf8a4ffbc9859848b3cdc7e3b78a3c
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: d4890b7bc5 -s ↵Xin Li
ours am: d96fcb19ab -s ours am skip reason: Change-Id Ida58f2c362f40266e64700d2695d9798d2a08a8c with SHA-1 612c6ec701 is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I393876e4f80707e8abef6c1c117c4cc0206e2ccc
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: d4890b7bc5 -s oursXin Li
am skip reason: Change-Id Ida58f2c362f40266e64700d2695d9798d2a08a8c with SHA-1 612c6ec701 is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I2043693baac049f211d276766caa6061ad4299df
2021-02-20Mark ab/7061308 as merged in stage.Xin Li
Bug: 180401296 Merged-In: Ida58f2c362f40266e64700d2695d9798d2a08a8c Change-Id: I4b8edec6c72129a09fdc412e0ed67c5927102f28
2021-02-16[LSC] Add LOCAL_LICENSE_KINDS to tools/carrier_settings am: cb2a91bb8d am: ↵Bob Badour
13af095fee am: 4fcee49274 am: c0e7eb5a23 Original change: https://android-review.googlesource.com/c/platform/tools/carrier_settings/+/1589087 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ib891f2480cdcdb86fd546eccd7302d8655ddd73a
2021-02-16[LSC] Add LOCAL_LICENSE_KINDS to tools/carrier_settings am: cb2a91bb8d am: ↵Bob Badour
13af095fee am: 4fcee49274 am: c0e7eb5a23 Original change: https://android-review.googlesource.com/c/platform/tools/carrier_settings/+/1589087 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I39f376909d15f78827326fb504f273054fb9be92
2021-02-16[LSC] Add LOCAL_LICENSE_KINDS to tools/carrier_settings am: cb2a91bb8d am: ↵Bob Badour
13af095fee am: 4fcee49274 Original change: https://android-review.googlesource.com/c/platform/tools/carrier_settings/+/1589087 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I137434a893def7a53ad3d3f11ff5ebb6efbd40ca
2021-02-16[LSC] Add LOCAL_LICENSE_KINDS to tools/carrier_settings am: cb2a91bb8d am: ↵Bob Badour
13af095fee Original change: https://android-review.googlesource.com/c/platform/tools/carrier_settings/+/1589087 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I561bb36f4cdc61b0ef1db4821646f1b2030ea982