aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2021-11-10Merge "Prune departed users from OWNERS" am: 5cf511179c am: 15fe9a0151 am: ↵t_frc_odp_330442040t_frc_odp_330442000t_frc_con_330443020t_frc_cbr_330443000t_frc_ase_330444010t_frc_art_330443060t_frc_adb_330444000frc_340821000frc_340819280frc_340819220frc_340819190frc_340819030frc_340819020frc_340819010frc_340818170frc_340818110android-vts-14.0_r4android-vts-14.0_r3android-vts-14.0_r2android-vts-14.0_r1android-u-beta-1-gplandroid-security-14.0.0_r8android-security-14.0.0_r7android-security-14.0.0_r6android-security-14.0.0_r5android-security-14.0.0_r4android-security-14.0.0_r3android-security-14.0.0_r2android-security-14.0.0_r1android-platform-14.0.0_r7android-platform-14.0.0_r6android-platform-14.0.0_r5android-platform-14.0.0_r4android-platform-14.0.0_r3android-platform-14.0.0_r2android-platform-14.0.0_r1android-cts-14.0_r4android-cts-14.0_r3android-cts-14.0_r2android-cts-14.0_r1android-14.0.0_r9android-14.0.0_r8android-14.0.0_r7android-14.0.0_r6android-14.0.0_r5android-14.0.0_r45android-14.0.0_r44android-14.0.0_r43android-14.0.0_r42android-14.0.0_r41android-14.0.0_r40android-14.0.0_r4android-14.0.0_r39android-14.0.0_r38android-14.0.0_r3android-14.0.0_r28android-14.0.0_r27android-14.0.0_r26android-14.0.0_r25android-14.0.0_r24android-14.0.0_r23android-14.0.0_r22android-14.0.0_r21android-14.0.0_r20android-14.0.0_r2android-14.0.0_r19android-14.0.0_r18android-14.0.0_r17android-14.0.0_r16android-14.0.0_r15android-14.0.0_r14android-14.0.0_r13android-14.0.0_r12android-14.0.0_r11android-14.0.0_r10android-14.0.0_r1android-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_341710010aml_uwb_341513070aml_uwb_341511050aml_uwb_341310300aml_uwb_341310030aml_uwb_341111010aml_uwb_341011000aml_uwb_331910010aml_uwb_331820070aml_uwb_331613010aml_uwb_331611010aml_uwb_331410010aml_uwb_331310030aml_uwb_331115000aml_uwb_331015040aml_uwb_330810010aml_tz5_341510070aml_tz5_341510050aml_tz5_341510010aml_tz4_332714070aml_tz4_332714050aml_tz4_332714010aml_tz4_331910000aml_tz4_331314030aml_tz4_331314020aml_tz4_331314010aml_tz4_331012050aml_tz4_331012040aml_tz4_331012000aml_rkp_341510000aml_rkp_341311000aml_rkp_341114000aml_rkp_341015010aml_rkp_341012000aml_odp_341717000aml_odp_341610000aml_hef_341717050aml_hef_341613000aml_hef_341512030aml_hef_341415040aml_hef_341311010aml_hef_341114030aml_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_cfg_341510000aml_ase_341510000aml_ase_341410000aml_ase_341310010aml_ase_341113000aml_ase_340913000aml_ase_331311020aml_ase_331112000aml_ase_331011020aml_ads_341720000aml_ads_341615050aml_ads_341517040aml_ads_341413000aml_ads_341316030aml_ads_341131050aml_ads_341027030aml_ads_340915050aml_ads_331920180aml_ads_331814200aml_ads_331710270aml_ads_331611190aml_ads_331511020aml_ads_331418080aml_ads_331131000main-16k-with-phonesmain-16kandroid14-tests-releaseandroid14-security-releaseandroid14-s2-releaseandroid14-s1-releaseandroid14-releaseandroid14-qpr1-s2-releaseandroid14-qpr1-releaseandroid14-platform-releaseandroid14-mainline-uwb-releaseandroid14-mainline-healthfitness-releaseandroid14-mainline-appsearch-releaseandroid14-mainline-adservices-releaseandroid14-gsiandroid14-devandroid14-d2-s5-releaseandroid14-d2-s4-releaseandroid14-d2-s3-releaseandroid14-d2-s2-releaseandroid14-d2-s1-releaseandroid14-d2-releaseandroid14-d1-s7-releaseandroid14-d1-s6-releaseandroid14-d1-s5-releaseandroid14-d1-s4-releaseandroid14-d1-s3-releaseandroid14-d1-s2-releaseandroid14-d1-s1-releaseandroid14-d1-releaseandroid13-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_tz5_341510010aml_tz4_332714010Treehugger Robot
b917e9a627 am: 574e1e9c57 am: 5c6a64c8e5 Original change: https://android-review.googlesource.com/c/platform/external/libogg/+/1883315 Change-Id: I140ff7b376f9aac5266a9413732cdc44f3464637
2021-11-10Merge "Prune departed users from OWNERS" am: 5cf511179c am: 15fe9a0151 am: ↵Treehugger Robot
b917e9a627 am: 574e1e9c57 Original change: https://android-review.googlesource.com/c/platform/external/libogg/+/1883315 Change-Id: Id0635ac7729d2ea17df30378a6a15b6815e2cb6e
2021-11-10Merge "Prune departed users from OWNERS" am: 5cf511179c am: 15fe9a0151 am: ↵Treehugger Robot
b917e9a627 Original change: https://android-review.googlesource.com/c/platform/external/libogg/+/1883315 Change-Id: I8b8519587760abac78bf9b1eafc8566259f0d6a2
2021-11-10Merge "Prune departed users from OWNERS" am: 5cf511179c am: 15fe9a0151Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/external/libogg/+/1883315 Change-Id: I7ce2c733409dfd2a985f605b5a0db463cfb7984c
2021-11-10Merge "Prune departed users from OWNERS" am: 5cf511179candroid-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-1Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/external/libogg/+/1883315 Change-Id: I528ecb681a9b8780c23aff9a75cd2385f5096964
2021-11-10Merge "Prune departed users from OWNERS"Treehugger Robot
2021-11-07Prune departed users from OWNERSRay Essick
Bug: 203731695 Test: repo upload Change-Id: Ie547d77ac0d55ba9e8b9af1006a9c4f8bfff32b4
2021-05-29Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/libogg" am: e759f05d5e am: ↵Bob Badour
93a3e403b1 am: 4828b7a4cf am: 4bf1a0dab6 am: d365c1184c Original change: https://android-review.googlesource.com/c/platform/external/libogg/+/1587907 Change-Id: Id873bc8560b06fa6a633719a80faf1d09d7d20df
2021-02-17Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/libogg" am: e759f05d5e am: ↵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
93a3e403b1 am: 4828b7a4cf am: 4bf1a0dab6 Original change: https://android-review.googlesource.com/c/platform/external/libogg/+/1587907 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ic5e3f6b3d0f22e27d08655ce39b66d7c1d6fba23
2021-02-17Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/libogg" am: e759f05d5e am: ↵Bob Badour
93a3e403b1 am: 4828b7a4cf am: 4bf1a0dab6 Original change: https://android-review.googlesource.com/c/platform/external/libogg/+/1587907 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I7b862d1b4804987f6fbf64c07128e41078567df9
2021-02-17Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/libogg" am: e759f05d5e am: ↵android-s-v2-preview-2android-s-v2-preview-1android-s-v2-beta-2android-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-s-v2-preview-1Bob Badour
93a3e403b1 am: 4828b7a4cf Original change: https://android-review.googlesource.com/c/platform/external/libogg/+/1587907 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ic30d75b2228ef72a4cc2227c2d655e4f4af67c9b
2021-02-17Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/libogg" am: e759f05d5e am: ↵Bob Badour
93a3e403b1 Original change: https://android-review.googlesource.com/c/platform/external/libogg/+/1587907 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ia3360eca23a32c5eaa4d00062e4bec380845db7d
2021-02-17Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/libogg" am: e759f05d5eandroid-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/libogg/+/1587907 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I02fb1844306108356dd734038c95b69d026b2006
2021-02-17Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/libogg"android-s-preview-1Bob Badour
2021-02-12[LSC] Add LOCAL_LICENSE_KINDS to external/liboggBob Badour
Added SPDX-license-identifier-BSD SPDX-license-identifier-MIT legacy_notice legacy_unencumbered to: Android.bp Bug: 68860345 Bug: 151177513 Bug: 151953481 Test: m all Exempt-From-Owner-Approval: janitorial work Change-Id: Ie96a2c269655781692666320ff8909c1f5a6efd2
2020-05-04Merge "Add METADATA to libogg: BSD+MIT=NOTICE" am: c3a96c2731 am: 88ab2345a6 ↵Treehugger Robot
am: 40b08c2b91 am: 7d825eb51e am: 9970770120 Change-Id: I510fbcf11cb5049dbffb88e2061d57b0cf31d8dd
2020-05-04Merge "Add METADATA to libogg: BSD+MIT=NOTICE" am: c3a96c2731 am: 88ab2345a6 ↵Treehugger Robot
am: 40b08c2b91 am: 7d825eb51e Change-Id: Ie332e80d16ee9b19c7baa6bb988ded985eb877cd
2020-05-04Merge "Add METADATA to libogg: BSD+MIT=NOTICE" am: c3a96c2731 am: 88ab2345a6 ↵Treehugger Robot
am: 40b08c2b91 Change-Id: Ie7dcbc1e011961d3bd8e08cfc97f4e10672f9d73
2020-05-04Merge "Add METADATA to libogg: BSD+MIT=NOTICE" am: c3a96c2731 am: 88ab2345a6Treehugger Robot
Change-Id: I8332681b1678fd13fc1eefc0b29b62808ee76f11
2020-05-04Merge "Add METADATA to libogg: BSD+MIT=NOTICE" am: c3a96c2731android-r-beta-3android-r-beta-2Treehugger Robot
Change-Id: I2f55ad00b52fea801e1b2d6966dcfb205bdc410a
2020-05-04Merge "Add METADATA to libogg: BSD+MIT=NOTICE"Treehugger Robot
2020-04-28Add METADATA to libogg: BSD+MIT=NOTICEBob Badour
Bug: 68860345 Bug: 69058154 Bug: 151953481 Test: no code changes Change-Id: I34d9804f3a47b9b174a732e87b171e0c38f6e694
2019-10-30[automerger skipped] DO NOT MERGE - ↵r_aml_301500702android-mainline-12.0.0_r55android-mainline-11.0.0_r9android-mainline-11.0.0_r8android-mainline-11.0.0_r7android-mainline-11.0.0_r6android-mainline-11.0.0_r5android-mainline-11.0.0_r45android-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_r4android-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_r33android-mainline-11.0.0_r32android-mainline-11.0.0_r31android-mainline-11.0.0_r30android-mainline-11.0.0_r3android-mainline-11.0.0_r29android-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_r2android-mainline-11.0.0_r19android-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_r12android-mainline-11.0.0_r10android-mainline-11.0.0_r1android-11.0.0_r9android-11.0.0_r8android-11.0.0_r7android-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_r18android-11.0.0_r16android-11.0.0_r15android-11.0.0_r14android-11.0.0_r13android-11.0.0_r12android-11.0.0_r11android-11.0.0_r10android11-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-mainline-tethering-releaseandroid11-mainline-sparse-2021-jan-releaseandroid11-mainline-sparse-2020-dec-releaseandroid11-mainline-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-devandroid11-d2-releaseandroid11-d1-s7-releaseandroid11-d1-s6-releaseandroid11-d1-s5-releaseandroid11-d1-s1-releaseandroid11-d1-releaseandroid11-d1-b-releaseXin Li
qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master am: 7f296fb742 am: 2f56a5cccb -s ours am skip reason: subject contains skip directive Change-Id: Ia547d11768af8e2377bbe8f4f4c72f9b04d0a820
2019-10-30DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into ↵android-r-preview-4android-r-preview-3android-r-preview-2Xin Li
stage-aosp-master am: 7f296fb742 Change-Id: I928fee513ee054fb5a309ed241ad6fa51277a74d
2019-10-30DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into ↵android-r-preview-1Xin Li
stage-aosp-master Bug: 142003500 Change-Id: I2b36d7d4cd66bdce9bbd1305f247131593efea99
2019-09-08[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into ↵Xin Li
stage-aosp-master am: 655cce9a9a -s ours am: 8f369d8ac4 -s ours am: dd611e645e -s ours am skip reason: change_id I1dc1105688ca3684b3c2ff66ebf69cb58d6722cb with SHA1 2a4184366a is in history Change-Id: I8016f957934136a76545eecc1c72854ef71da31b
2019-09-08[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into ↵Xin Li
stage-aosp-master am: 655cce9a9a -s ours am: 8f369d8ac4 -s ours am skip reason: change_id I1dc1105688ca3684b3c2ff66ebf69cb58d6722cb with SHA1 2a4184366a is in history Change-Id: If9024df562f32e0d263905f3ef0c2330824b2869
2019-09-08[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into ↵Xin Li
stage-aosp-master am: 655cce9a9a -s ours am skip reason: change_id I1dc1105688ca3684b3c2ff66ebf69cb58d6722cb with SHA1 2a4184366a is in history Change-Id: I2647a034fd94fde81e55fcd8b364965acf1f52cb
2019-09-08Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-masterXin Li
No content change. Bug: 135460123 Change-Id: I24e5e38765de4e1a309deb1c54c0572478677134 Merged-In: I1dc1105688ca3684b3c2ff66ebf69cb58d6722cb
2019-09-05[automerger skipped] Merge "DO NOT MERGE - Merge Android 10 into master" am: ↵Xin Li
01e898384e -s ours am: d98782e2ba am: 921ef16d88 am: 6085ee872a -s ours am skip reason: subject contains skip directive Change-Id: I4bd1815e1721d79dedd65ade5213341558ede621
2019-09-05[automerger skipped] Merge "DO NOT MERGE - Merge Android 10 into master" am: ↵Xin Li
01e898384e -s ours am: d98782e2ba am: 921ef16d88 Change-Id: I111b6aa60267556924d71b0003145a6a6a34f106
2019-09-05[automerger skipped] Merge "DO NOT MERGE - Merge Android 10 into master" am: ↵Xin Li
01e898384e -s ours am: d98782e2ba Change-Id: Ie6339085c557def2c215f281f28b9086c67fadb4
2019-09-05[automerger skipped] Merge "DO NOT MERGE - Merge Android 10 into master"Xin Li
am: 01e898384e -s ours am skip reason: subject contains skip directive Change-Id: Ia5941e8f2b714cb5adb2658d7338b813a7275512
2019-09-05Merge "DO NOT MERGE - Merge Android 10 into master"ndk-sysroot-r21Xin Li
2019-09-04DO NOT MERGE - Merge Android 10 into masterXin Li
Bug: 139893257 Change-Id: I1dc1105688ca3684b3c2ff66ebf69cb58d6722cb
2019-07-02[automerger skipped] DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor ↵Xin Li
(5699924) into stage-aosp-master am: 385dcd8b63 am: 7256fe0bb2 -s ours am skip reason: subject contains skip directive Change-Id: I3581015f9f5bb9f6009ee8d7a45a7540bb416305
2019-07-02DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into ↵Xin Li
stage-aosp-master am: 385dcd8b63 Change-Id: Ie6854b289d097ced0d87222fbeb6c361324b92a9
2019-07-01DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into ↵temp_140451723Xin Li
stage-aosp-master Bug: 134405016 Change-Id: I5e7e97fa0c238ae5eee8530cdbd1be72c9f83454
2019-03-12Comment out sanitization in libogg.android-mainline-10.0.0_r9android-mainline-10.0.0_r7android-mainline-10.0.0_r5android-mainline-10.0.0_r4android-mainline-10.0.0_r10android-10.0.0_r9android-10.0.0_r8android-10.0.0_r7android-10.0.0_r45android-10.0.0_r44android-10.0.0_r43android-10.0.0_r42android-10.0.0_r41android-10.0.0_r40android-10.0.0_r39android-10.0.0_r38android-10.0.0_r37android-10.0.0_r36android-10.0.0_r35android-10.0.0_r34android-10.0.0_r33android-10.0.0_r32android-10.0.0_r31android-10.0.0_r30android-10.0.0_r29android-10.0.0_r28android-10.0.0_r27android-10.0.0_r26android-10.0.0_r25android-10.0.0_r24android-10.0.0_r23android-10.0.0_r22android-10.0.0_r21android-10.0.0_r20android-10.0.0_r19android-10.0.0_r18android-10.0.0_r16android-10.0.0_r15android-10.0.0_r14android-10.0.0_r13android-10.0.0_r12android10-qpr3-s1-releaseandroid10-qpr3-releaseandroid10-qpr2-s4-releaseandroid10-qpr2-s3-releaseandroid10-qpr2-s2-releaseandroid10-qpr2-s1-releaseandroid10-qpr2-releaseandroid10-qpr1-releaseandroid10-qpr1-mainline-releaseandroid10-qpr1-d-releaseandroid10-qpr1-c-s1-releaseandroid10-qpr1-c-releaseandroid10-qpr1-b-s1-releaseandroid10-qpr1-b-releaseandroid10-mainline-media-releaseandroid10-devandroid10-d4-s1-releaseandroid10-d4-releaseandroid10-c2f2-s2-releaseandroid10-c2f2-s1-releaseandroid10-c2f2-releaseIvan Lozano
Sanitization is silently skipped for NDK libraries such as libogg. Comment out these parts of our blueprint file to ensure there isn't any confusion about whether this is being sanitized until we can address this behavior in the build system. Bug: 124978545 Test: mma -j Change-Id: I13ae29230785fd6f9a7b9876c43e656dcd515429
2019-02-25Merge stage-aosp-master into pi-dev-plus-aospXin Li
am: 2e1c06cea6 Change-Id: I9bc06a44feaf9ce8e0e54dd16f0cc18ec416f35c
2019-02-25Merge stage-aosp-master into pi-dev-plus-aospXin Li
Bug: 126125118 Change-Id: I42c2c5e222d417d44a4daba75fd0553622440c4f
2019-02-20DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-masterandroid-o-mr1-iot-release-1.0.14android-o-mr1-iot-release-1.0.13Xin Li
Bug: 120848293 Change-Id: I502146af7ccfda13de8975f50cafcd31ff284673
2019-02-12Remove sanitizer diagnostics from libogg.Ivan Lozano
Remove sanitizer diagnostics from libogg. Bug: 111500191 Test: mma -j Change-Id: Idc9a52feb012d5d1df45eea0b0c96f52fc3bbf79
2019-01-17Merge "Add default code reviewers into OWNERS" am: d55aeb8945 am: 0123bc9231Chih-hung Hsieh
am: 61acc8ca26 Change-Id: I867fea8a833f2555bc9bf07f25ac08d304834df0
2019-01-17Merge "Add default code reviewers into OWNERS" am: d55aeb8945Chih-hung Hsieh
am: 0123bc9231 Change-Id: Ic33f54771a8d690a6ac9f9c98d3bd88a70574132
2019-01-17Merge "Add default code reviewers into OWNERS"Chih-hung Hsieh
am: d55aeb8945 Change-Id: I535c0a1bc7b9fbe754c203117c841e606a9c30a6
2019-01-18Merge "Add default code reviewers into OWNERS"android-q-preview-6android-q-preview-5android-q-preview-4android-q-preview-2.5android-q-preview-1android-o-mr1-iot-release-1.0.12android-o-mr1-iot-release-1.0.10oreo-mr1-iot-releaseChih-hung Hsieh
2019-01-17Add default code reviewers into OWNERSChih-Hung Hsieh
Bug: 33166666 Test: gerrit uploader Change-Id: I570d3873061e9be380962cc032679c570c4af131
2018-12-27Merge "Enforce ubsan sanitizers in libogg."Ivan Lozano
2018-12-18Enforce ubsan sanitizers in libogg.Ivan Lozano
Keep sanitizers in diagnostics mode but don't recover from them so we get errors in tombstones. Bug: 110791537 Test: mma -j Change-Id: I8258219a7a3c52a317e602553ac45aa9c89f3939
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-23 20:40:31 +0000