summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2022-09-18Disable Python 2 for py-ply.main-16kKrzysztof Kosiński
The only use in Android is in vts_kernel_proc_file_api_test, which is a Python 3 only test. Bug: 245854393 Test: presubmit Change-Id: I122fc3d2bd7f096f0f72cfcb14a8311e7ec9fe8b
2021-06-02Merge sc-mainline-prodt_frc_tz4_330443010t_frc_swc_330443040t_frc_swc_330443010t_frc_sta_330443010t_frc_sch_330443040t_frc_sch_330443010t_frc_res_330443000t_frc_per_330444010t_frc_odp_330442040t_frc_odp_330442000t_frc_neu_330443030t_frc_neu_330443000t_frc_net_330443000t_frc_med_330443030t_frc_ips_330443010t_frc_ext_330443000t_frc_doc_330543000t_frc_doc_330443060t_frc_doc_330443000t_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_med_330913000aml_go_ips_330911000aml_go_ext_330912000aml_go_doc_330912000aml_go_con_330913000aml_go_cbr_330912000aml_go_ase_330913000aml_go_art_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-media-releaseandroid13-mainline-go-ipsec-releaseandroid13-mainline-go-extservices-releaseandroid13-mainline-go-documentsui-releaseandroid13-mainline-go-conscrypt-releaseandroid13-mainline-go-cellbroadcast-releaseandroid13-mainline-go-art-releaseandroid13-mainline-go-appsearch-releaseandroid13-mainline-go-adservices-releaseandroid13-mainline-go-adbd-releaseandroid13-mainline-appsearch-releaseandroid13-mainline-adservices-releaseandroid13-frc-scheduling-releaseandroid13-frc-resolv-releaseandroid13-frc-permission-releaseandroid13-frc-os-statsd-releaseandroid13-frc-odp-releaseandroid13-frc-neuralnetworks-releaseandroid13-frc-networking-releaseandroid13-frc-media-swcodec-releaseandroid13-frc-media-releaseandroid13-frc-ipsec-releaseandroid13-frc-extservices-releaseandroid13-frc-documentsui-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_332714010Xin Li
Bug: 189946434 Change-Id: I974290ac6a3e8db3a933554508bd2462a0a7de0d
2021-02-16[LSC] Add LOCAL_LICENSE_KINDS to external/ply am: fc08a3caee am: cbdb98a86a ↵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-releaseBob Badour
am: 6becfa3dc3 am: be54bc627d Original change: https://android-review.googlesource.com/c/platform/external/ply/+/1588702 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I9f78aada122b44aed54d0f8a73bdc36bf81a3334
2021-02-16[LSC] Add LOCAL_LICENSE_KINDS to external/ply am: fc08a3caee am: cbdb98a86a ↵Bob Badour
am: 6becfa3dc3 am: be54bc627d Original change: https://android-review.googlesource.com/c/platform/external/ply/+/1588702 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I76b67714c11c0eb3a39fa272a2748b17101e2750
2021-02-16[LSC] Add LOCAL_LICENSE_KINDS to external/ply am: fc08a3caee am: cbdb98a86a ↵android-t-preview-2android-t-preview-1android-t-beta-3android-s-v2-preview-2android-s-v2-preview-1android-s-v2-beta-3android-s-v2-beta-2android-s-qpr3-beta-1android-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-releaseandroid-t-preview-1android-s-v2-preview-1android-s-v2-beta-3android-s-qpr3-beta-1Bob Badour
am: 6becfa3dc3 Original change: https://android-review.googlesource.com/c/platform/external/ply/+/1588702 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I876e4494d55d3670bd9ab36065a7c8016f507d64
2021-02-16[LSC] Add LOCAL_LICENSE_KINDS to external/ply am: fc08a3caee am: cbdb98a86aBob Badour
Original change: https://android-review.googlesource.com/c/platform/external/ply/+/1588702 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I22fce3b1c7b6bbb0a5d1413e2fd160cd79ed6206
2021-02-16[LSC] Add LOCAL_LICENSE_KINDS to external/ply am: fc08a3caeeandroid-s-beta-5android-s-beta-4android-s-beta-3android-s-beta-2android-s-beta-1android-s-beta-5android-s-beta-4Bob Badour
Original change: https://android-review.googlesource.com/c/platform/external/ply/+/1588702 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I827a817d56a98a073205cff42db6faa9a6293efc
2021-02-12[LSC] Add LOCAL_LICENSE_KINDS to external/plyandroid-s-preview-1Bob Badour
Added SPDX-license-identifier-BSD legacy_unencumbered to: Android.bp ply/Android.bp Bug: 68860345 Bug: 151177513 Bug: 151953481 Test: m all Exempt-From-Owner-Approval: janitorial work Change-Id: Iec9300f0cfe07eca33bcd676ca706824b2ed1060
2021-01-22Fix license_type. BSD is a NOTICE license. am: 10f4c49d40 am: f9b882fec0 am: ↵Bob Badour
27f972fc21 Original change: https://android-review.googlesource.com/c/platform/external/ply/+/1556492 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I72a5c3c01e09001e693142e2f0a0f839867fc682
2021-01-22Fix license_type. BSD is a NOTICE license. am: 10f4c49d40 am: f9b882fec0Bob Badour
Original change: https://android-review.googlesource.com/c/platform/external/ply/+/1556492 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I08362c4ef02dfbf0ea964ecdd49527c441701f62
2021-01-22Fix license_type. BSD is a NOTICE license. am: 10f4c49d40Bob Badour
Original change: https://android-review.googlesource.com/c/platform/external/ply/+/1556492 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ia2d89965389a983f563ae635f2a4324832c40bb8
2021-01-21Fix license_type. BSD is a NOTICE license.Bob Badour
See: http://go/android-license-checking-v2-lsc Test: m all Bug: 151953481 Bug: 151177513 Bug: 67772237 Change-Id: I3a5b80377ac327f223515b0a856731111396c36f
2020-04-28[automerger skipped] Enable ply an importable module. am: edb5967727 am: ↵Jim Tang
82957451d3 am: 21c343dd3b am: cf630d720b -s ours am: 4c047e3e67 -s ours am skip reason: Change-Id Iafb1c669c16b20eec288bad6d2ea530f0d3ab2a8 with SHA-1 edb5967727 is in history Change-Id: Ia185ccd98cc4042d282571b4f41ff506aef2dd13
2020-04-28Correct license header of ply to AOSP am: 9eb1e198ee am: 36da259d11 am: ↵Dan Shi
8223645d85 am: e830249417 am: 30f8317cc9 Change-Id: I5cfc260d7de12a55ee36993cb9b4469514d14081
2020-04-28[automerger skipped] Enable ply an importable module. am: edb5967727 am: ↵Jim Tang
82957451d3 -s ours am: 9fdd401e0a -s ours am: 87af15b78d -s ours am skip reason: Change-Id Iafb1c669c16b20eec288bad6d2ea530f0d3ab2a8 with SHA-1 edb5967727 is in history Change-Id: Ie11ad00142a21db9ba86a02cbb5e07dfc2b4b7b5
2020-04-28[automerger skipped] Enable ply an importable module. am: edb5967727 -s ours ↵Jim Tang
am: 275f095458 -s ours am: cc5aee9b95 -s ours am: 49af262394 -s ours am skip reason: Change-Id Iafb1c669c16b20eec288bad6d2ea530f0d3ab2a8 with SHA-1 0b5a27fb00 is in history Change-Id: I7df007ae5dd108fc807ef4075e6fd09df5a48fdd
2020-04-28[automerger skipped] Enable ply an importable module. am: edb5967727 am: ↵Jim Tang
82957451d3 am: 21c343dd3b am: cf630d720b -s ours am skip reason: Change-Id Iafb1c669c16b20eec288bad6d2ea530f0d3ab2a8 with SHA-1 edb5967727 is in history Change-Id: I220817aeb9f777790dc1b3c75daa891baebc019b
2020-04-28Correct license header of ply to AOSP am: 9eb1e198ee am: 36da259d11 am: ↵Dan Shi
8223645d85 am: e830249417 Change-Id: I3e4113d5ddb29eca241cce005d418bffb9540701
2020-04-28[automerger skipped] Enable ply an importable module. am: edb5967727 am: ↵Jim Tang
82957451d3 -s ours am: 9fdd401e0a -s ours am skip reason: Change-Id Iafb1c669c16b20eec288bad6d2ea530f0d3ab2a8 with SHA-1 edb5967727 is in history Change-Id: I3c36d3799d22563bdd5b38dc27796dc2f1d2a166
2020-04-28[automerger skipped] Enable ply an importable module. am: edb5967727 -s ours ↵Jim Tang
am: 275f095458 -s ours am: cc5aee9b95 -s ours am skip reason: Change-Id Iafb1c669c16b20eec288bad6d2ea530f0d3ab2a8 with SHA-1 0b5a27fb00 is in history Change-Id: Ia62b8429e54333a0c900b7f65d397a38caf40a0b
2020-04-28Enable ply an importable module. am: edb5967727 am: 82957451d3 am: 21c343dd3bJim Tang
Change-Id: If232c4020bad95110bc1401f409808b7e8384cf3
2020-04-28Correct license header of ply to AOSP am: 9eb1e198ee am: 36da259d11 am: ↵Dan Shi
8223645d85 Change-Id: I7dcc602d130ed05d6b731e72a7a0ec89e656977b
2020-04-28Enable ply an importable module. am: edb5967727 am: 82957451d3android-11.0.0_r48android-11.0.0_r47android-11.0.0_r46android-11.0.0_r45android-11.0.0_r44android-11.0.0_r43android-11.0.0_r42android-11.0.0_r41android-11.0.0_r40android-11.0.0_r39android-11.0.0_r38android-11.0.0_r37android-11.0.0_r36android-11.0.0_r35android-11.0.0_r34android-11.0.0_r33android-11.0.0_r32android-11.0.0_r31android-11.0.0_r30android-11.0.0_r29android-11.0.0_r28android-11.0.0_r27android-11.0.0_r26android-11.0.0_r24android-11.0.0_r23android-11.0.0_r22android-11.0.0_r21android-11.0.0_r20android-11.0.0_r19android-11.0.0_r18android11-qpr3-s1-releaseandroid11-qpr3-releaseandroid11-qpr2-releaseandroid11-qpr1-s2-releaseandroid11-qpr1-s1-releaseandroid11-qpr1-releaseandroid11-qpr1-d-s1-releaseandroid11-qpr1-d-releaseandroid11-qpr1-c-releaseandroid11-d2-releaseJim Tang
Change-Id: I9e9825721f94d5b5cd85df924d93a0bc22bf5ddc
2020-04-28[automerger skipped] Enable ply an importable module. am: edb5967727 am: ↵Jim Tang
82957451d3 -s ours am skip reason: Change-Id Iafb1c669c16b20eec288bad6d2ea530f0d3ab2a8 with SHA-1 edb5967727 is in history Change-Id: Ia70572d183ced78801fdf8bb46709d54e3da3d41
2020-04-28[automerger skipped] Enable ply an importable module. am: edb5967727 -s ours ↵Jim Tang
am: 275f095458 -s ours am skip reason: Change-Id Iafb1c669c16b20eec288bad6d2ea530f0d3ab2a8 with SHA-1 0b5a27fb00 is in history Change-Id: I3a2447dccd9757ca2beaca8f651e1894040dd2e3
2020-04-28Correct license header of ply to AOSP am: 9eb1e198ee am: 36da259d11Dan Shi
Change-Id: I2898a5c27b5a16f78c25667ba40ad90c500ac89a
2020-04-28Enable ply an importable module. am: edb5967727android-11.0.0_r16android11-d1-b-releaseJim Tang
Change-Id: Iaaa634f04174ba8aaa3fc382c6dc5796866169ca
2020-04-28[automerger skipped] Enable ply an importable module. am: edb5967727 -s oursJim Tang
am skip reason: Change-Id Iafb1c669c16b20eec288bad6d2ea530f0d3ab2a8 with SHA-1 0b5a27fb00 is in history Change-Id: Ifa95bd6c97d262d6e7733639758fa4ca7c80a6c5
2020-04-28Correct license header of ply to AOSP am: 9eb1e198eeandroid-r-beta-3android-r-beta-2Dan Shi
Change-Id: Ia879823d072246f7ecec16ef6b37cb55d4d7de79
2020-04-28Correct license header of ply to AOSPDan Shi
Bug: 153941871 Test: None Change-Id: Ic48b01d0365bc8443986533746e149b7aa2c8cfc
2020-04-28Enable ply an importable module.android-mainline-11.0.0_r44android-mainline-11.0.0_r43android-mainline-11.0.0_r42android-mainline-11.0.0_r41android-mainline-11.0.0_r40android-mainline-11.0.0_r39android-mainline-11.0.0_r38android-mainline-11.0.0_r37android-mainline-11.0.0_r36android-mainline-11.0.0_r35android-mainline-11.0.0_r34android-mainline-11.0.0_r32android-mainline-11.0.0_r31android-mainline-11.0.0_r30android-mainline-11.0.0_r28android-mainline-11.0.0_r27android-mainline-11.0.0_r26android-mainline-11.0.0_r25android-mainline-11.0.0_r24android-mainline-11.0.0_r23android-mainline-11.0.0_r22android-mainline-11.0.0_r21android-mainline-11.0.0_r20android-mainline-11.0.0_r18android-mainline-11.0.0_r17android-mainline-11.0.0_r16android-mainline-11.0.0_r15android-mainline-11.0.0_r14android-mainline-11.0.0_r13android-mainline-11.0.0_r12android11-mainline-tethering-releaseandroid11-mainline-permission-releaseandroid11-mainline-os-statsd-releaseandroid11-mainline-networkstack-releaseandroid11-mainline-media-swcodec-releaseandroid11-mainline-media-releaseandroid11-mainline-extservices-releaseandroid11-mainline-documentsui-releaseandroid11-mainline-conscrypt-releaseandroid11-mainline-cellbroadcast-releaseandroid11-mainline-captiveportallogin-releaseandroid11-devJim Tang
Bug: 153941871 Test: build manually Change-Id: Iafb1c669c16b20eec288bad6d2ea530f0d3ab2a8 Merged-In: Iafb1c669c16b20eec288bad6d2ea530f0d3ab2a8 Merged-In: Ic48b01d0365bc8443986533746e149b7aa2c8cfc
2020-04-20Enable ply an importable module. am: 0b5a27fb00 am: 1f976d8d95 am: ↵Jim Tang
b3c01d6ef3 am: e8a8ca2e3d am: 9ed7b5e930 Change-Id: I3786b05c99d5610c112d4d2f9ab756d9a2382700
2020-04-20Enable ply an importable module. am: 0b5a27fb00 am: 1f976d8d95 am: ↵Jim Tang
b3c01d6ef3 am: e8a8ca2e3d Change-Id: If49c508554d9520b4239d37000d4cfe5e6a6e393
2020-04-20Enable ply an importable module. am: 0b5a27fb00 am: 1f976d8d95 am: b3c01d6ef3Jim Tang
Change-Id: I90534d5ca13b635117fddf8c1192bd0ee47a37eb
2020-04-20Enable ply an importable module. am: 0b5a27fb00 am: 1f976d8d95Jim Tang
Change-Id: Ie97eec7f513a6fc073018b03cff28586c15b381b
2020-04-20Enable ply an importable module. am: 0b5a27fb00Jim Tang
Change-Id: I1dcf5d0614aa07da36a530f04ee55626f095f3ef
2020-04-15Enable ply an importable module.Jim Tang
Bug: 153941871 Test: build manually Change-Id: Iafb1c669c16b20eec288bad6d2ea530f0d3ab2a8
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li
stag-aosp-master am: c0e414d5a4 -s ours am: 2c9eb61c91 am: 892f221302 am: 2104f3878b -s ours am skip reason: subject contains skip directive Change-Id: I73ac15f60fcf17be7ab8beafc9a0437d7a268121
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li
stag-aosp-master am: c0e414d5a4 -s ours am: 2c9eb61c91 am: 892f221302 Change-Id: I839bba4212c638338ced5c115ea07dc5004cd690
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li
stag-aosp-master am: c0e414d5a4 -s ours am: 2c9eb61c91 Change-Id: Ia0d3a85b3ed4740468747c480630f2cec7bccc60
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li
stag-aosp-master am: c0e414d5a4 -s ours am skip reason: subject contains skip directive Change-Id: I2f94a530e1668d1c71f50eb8b88ec7fe2cf39135
2020-04-09DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-masterXin Li
Bug: 151763422 Change-Id: Iaae749c1508e212b95c1d461d6e8584c020f0ee0
2020-03-26Remove redundant NOTICE copied from LICENSE. am: fc6a8cb464 am: fa60d37eff ↵Bob Badour
am: 0738e50f90 am: 7483603884 am: bf02891226 Change-Id: I12c004f3d2d745f170b200f994222767ba13a778
2020-03-26Remove redundant NOTICE copied from LICENSE. am: fc6a8cb464 am: fa60d37eff ↵Bob Badour
am: 0738e50f90 am: 7483603884 Change-Id: I9baa14ae3746ead0705ae74e4fc46bc18aa9c5d7
2020-03-26Remove redundant NOTICE copied from LICENSE. am: fc6a8cb464 am: fa60d37eff ↵Bob Badour
am: 0738e50f90 Change-Id: I15a0d1dd25bdaa7b75d712dd02d61b926f2002d8
2020-03-26Remove redundant NOTICE copied from LICENSE. am: fc6a8cb464 am: fa60d37effBob Badour
Change-Id: I2de2b04a0cd8fb5f340cc1d14886f4104963e9f6
2020-03-26Remove redundant NOTICE copied from LICENSE. am: fc6a8cb464 am: fa60d37effBob Badour
Change-Id: I817865095df6b23a57a821dfdfb5746f0d6ade46
2020-03-26Remove redundant NOTICE copied from LICENSE. am: fc6a8cb464Bob Badour
Change-Id: Ide30d1863d7f41e960040a53bd67677cd7272c01
2020-03-25Remove redundant NOTICE copied from LICENSE.Bob Badour
Identified using the below shell script: $ find -H . -name LICENSE -type f -print0 | xargs -0 dirname \ | while read dir; do \ if [ -f "${dir}/NOTICE" ] \ && diff "${dir}/LICENSE" "${dir}/NOTICE" >/dev/null; then \ echo "${dir}/NOTICE"; \ fi; \ done Now that http://r.android.com/r/1235427 and http://r.android.com/r/1238719 are merged, LICENSE files copied into NOTICE files are no longer needed. Bug: 67772237 Bug: 68860345 Test: manually built and diffed before and after system image notices Change-Id: Idddbb30a2620ce132df9afc701ea850d872ed70b
2019-10-30[automerger skipped] DO NOT MERGE - ↵Xin Li
qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master am: 2354a64555 am: 0dc471014d -s ours am skip reason: subject contains skip directive Change-Id: I6145aca9fb5ebacd87612efca64b64cc9a41ad5c
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-20 13:14:18 +0000