aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2021-05-29[LSC] Add LOCAL_LICENSE_KINDS to external/cn-cbor am: 697d6cc3f2 am: ↵t_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_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_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_341610000aml_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_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_cfg_341510000aml_ase_341510000aml_ase_341410000aml_ase_341310010aml_ase_341113000aml_ase_340913000aml_ase_331311020aml_ase_331112000aml_ase_331011020aml_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-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_tz5_341510010aml_tz4_332714010Bob Badour
387f3be20b am: 6aabbad531 am: 6a0f6a5375 am: da2abc2b75 Original change: https://android-review.googlesource.com/c/platform/external/cn-cbor/+/1588630 Change-Id: Ib79e4f3bcec9dbfc054cf0c8c8242c5fcf74267e
2021-05-29Mark cn-cbor_test as not gtest am: 97c813c112 am: e665ba070a am: 9c65b9cea6 ↵Julien Desprez
am: 16d6c126b4 am: ff60d19ebb Original change: https://android-review.googlesource.com/c/platform/external/cn-cbor/+/1581965 Change-Id: Ieeebbd630f47e51d45ca0de08e276f273017b9d8
2021-02-17[LSC] Add LOCAL_LICENSE_KINDS to external/cn-cbor am: 697d6cc3f2 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
387f3be20b am: 6aabbad531 am: 6a0f6a5375 Original change: https://android-review.googlesource.com/c/platform/external/cn-cbor/+/1588630 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I17e1dbeb071526f3246c6c3cca5e4e6975609b38
2021-02-17[LSC] Add LOCAL_LICENSE_KINDS to external/cn-cbor am: 697d6cc3f2 am: ↵Bob Badour
387f3be20b am: 6aabbad531 am: 6a0f6a5375 Original change: https://android-review.googlesource.com/c/platform/external/cn-cbor/+/1588630 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ia0c8e8ca00d67f129df6c74e5307eae0db2d68b5
2021-02-17[LSC] Add LOCAL_LICENSE_KINDS to external/cn-cbor am: 697d6cc3f2 am: ↵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
387f3be20b am: 6aabbad531 Original change: https://android-review.googlesource.com/c/platform/external/cn-cbor/+/1588630 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I6c25f8e2cd5333020fedac0485fb3180c44eb5f5
2021-02-17[LSC] Add LOCAL_LICENSE_KINDS to external/cn-cbor am: 697d6cc3f2 am: 387f3be20bBob Badour
Original change: https://android-review.googlesource.com/c/platform/external/cn-cbor/+/1588630 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ic6aa493c76f627a3cc69ab9c1179454f8ca7074d
2021-02-17[LSC] Add LOCAL_LICENSE_KINDS to external/cn-cbor am: 697d6cc3f2android-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/cn-cbor/+/1588630 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I48bbf9d25ebdb103ee99df067996c408d93683c8
2021-02-12[LSC] Add LOCAL_LICENSE_KINDS to external/cn-cborandroid-s-preview-1Bob Badour
Added SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-MIT to: Android.bp Bug: 68860345 Bug: 151177513 Bug: 151953481 Test: m all Exempt-From-Owner-Approval: janitorial work Change-Id: Ic2a00024be19cf2abb06685dd296c3ccd0177039
2021-02-10Mark cn-cbor_test as not gtest am: 97c813c112 am: e665ba070a am: 9c65b9cea6 ↵Julien Desprez
am: 16d6c126b4 Original change: https://android-review.googlesource.com/c/platform/external/cn-cbor/+/1581965 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I86d798d90ddcb93bb3016b04cbce09ab840e82cc
2021-02-10Mark cn-cbor_test as not gtest am: 97c813c112 am: e665ba070a am: 9c65b9cea6 ↵Julien Desprez
am: 16d6c126b4 Original change: https://android-review.googlesource.com/c/platform/external/cn-cbor/+/1581965 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I707a7dcd583b73f24921851abceff21c37c0c964
2021-02-10Mark cn-cbor_test as not gtest am: 97c813c112 am: e665ba070a am: 9c65b9cea6Julien Desprez
Original change: https://android-review.googlesource.com/c/platform/external/cn-cbor/+/1581965 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Iaa871d596fee3e39d0889f175e33334e7ef3e4e6
2021-02-10Mark cn-cbor_test as not gtest am: 97c813c112 am: e665ba070aJulien Desprez
Original change: https://android-review.googlesource.com/c/platform/external/cn-cbor/+/1581965 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ia0e166b0785ec846dbab0ec8a15141f615e2230c
2021-02-10Mark cn-cbor_test as not gtest am: 97c813c112Julien Desprez
Original change: https://android-review.googlesource.com/c/platform/external/cn-cbor/+/1581965 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I998f948ee449398bfcc6a9124ec2d2dc0baca7fd
2021-02-10Mark cn-cbor_test as not gtestJulien Desprez
it uses ctest. Test: None Bug: 179092189 Exempt-From-Owner-Approval: simple build change Change-Id: I42793358f3aa08f25006789aa18f910112dcdd35
2020-04-16Upgrade cn-cbor to c2e53733a895587c2910d2b2a1312d4224e5a474 am: 15e4988d25 ↵Haibo Huang
am: 8f258525f7 am: b399972214 am: cd5174925d am: 400319a50b Change-Id: Iff80f60dd8f4bad2d503728c0488ddacec6d3138
2020-04-16Upgrade cn-cbor to c2e53733a895587c2910d2b2a1312d4224e5a474 am: 15e4988d25 ↵Haibo Huang
am: 8f258525f7 am: b399972214 am: cd5174925d Change-Id: Ieaf790587138aa416cf08f342f86b476cd9b4360
2020-04-16Upgrade cn-cbor to c2e53733a895587c2910d2b2a1312d4224e5a474 am: 15e4988d25 ↵Haibo Huang
am: 8f258525f7 am: b399972214 Change-Id: I648cd514842c37f1432c32e081576fd5dd61c418
2020-04-16Upgrade cn-cbor to c2e53733a895587c2910d2b2a1312d4224e5a474 am: 15e4988d25 ↵Haibo Huang
am: 8f258525f7 Change-Id: If719730d15e78b86c1402f24894cdd15c8bbecfd
2020-04-15Upgrade cn-cbor to c2e53733a895587c2910d2b2a1312d4224e5a474 am: 15e4988d25android-r-beta-3android-r-beta-2Haibo Huang
Change-Id: I8d1b43e23a1266cdc8890baf909da752a729dd7b
2020-04-15Upgrade cn-cbor to c2e53733a895587c2910d2b2a1312d4224e5a474Haibo Huang
Exempt-From-Owner-Approval: upgrade Change-Id: I65846d53d2a99b7c75129a13c21cc1d00ebc0fa5
2020-04-08Update README for the 2020supstream-masterCarsten Bormann
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: ce9bc12ea7 am: d581c0ae70 -s ours am skip reason: subject contains skip directive Change-Id: Iad879a964e5705cfe670a6567184b91d5e9d07c7
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: ce9bc12ea7 Change-Id: I7a7194be0056c860569e9b7b23529b7a65de4b4f
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: I3af3a2baa264dd33134f4297ebc50fd93f73e0fb
2019-09-08[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into ↵Xin Li
stage-aosp-master am: 18b9201c34 -s ours am: dca0437cfb -s ours am: d38204c9c7 -s ours am skip reason: change_id Ic655324c52447411209c7ab8c225af31e3f92241 with SHA1 96f07d819b is in history Change-Id: I7aa1b9f1e84ce5f574cf7483f28d4ea48edcc5a8
2019-09-08[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into ↵Xin Li
stage-aosp-master am: 18b9201c34 -s ours am: dca0437cfb -s ours am skip reason: change_id Ic655324c52447411209c7ab8c225af31e3f92241 with SHA1 96f07d819b is in history Change-Id: Ic0c7e1d8d09663d1e13e3637623158d686b25f4b
2019-09-08[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into ↵Xin Li
stage-aosp-master am: 18b9201c34 -s ours am skip reason: change_id Ic655324c52447411209c7ab8c225af31e3f92241 with SHA1 96f07d819b is in history Change-Id: Ica5d000e82d8f7b03dbb6d4fad75a38f4bcc1202
2019-09-08Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-masterXin Li
No content change. Bug: 135460123 Change-Id: I5d8caedee80a3a6bf64402ec36858c088899de8c Merged-In: Ic655324c52447411209c7ab8c225af31e3f92241
2019-09-05[automerger skipped] DO NOT MERGE - Merge Android 10 into master am: ↵Xin Li
96f07d819b -s ours am: 5174cdc09b am: e4dc413579 am: 9b67c42838 -s ours am skip reason: subject contains skip directive Change-Id: Idd1dfa0fa1ee579c7141cbe06ab919ab451ed6f8
2019-09-05[automerger skipped] DO NOT MERGE - Merge Android 10 into master am: ↵Xin Li
96f07d819b -s ours am: 5174cdc09b am: e4dc413579 Change-Id: I0b332e2db11b5c24b379465545fd095b523d71d2
2019-09-05[automerger skipped] DO NOT MERGE - Merge Android 10 into master am: ↵Xin Li
96f07d819b -s ours am: 5174cdc09b Change-Id: I78585c0e0bbb1c6adc09aca5e3e846075ea92ddb
2019-09-05[automerger skipped] DO NOT MERGE - Merge Android 10 into masterXin Li
am: 96f07d819b -s ours am skip reason: subject contains skip directive Change-Id: I5e996bcf3f3076963128a52868cea3137462b13b
2019-09-04DO NOT MERGE - Merge Android 10 into masterndk-sysroot-r21Xin Li
Bug: 139893257 Change-Id: Ic655324c52447411209c7ab8c225af31e3f92241
2019-07-02[automerger skipped] DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor ↵Xin Li
(5699924) into stage-aosp-master am: 2294953742 am: 607f5a086d -s ours am skip reason: subject contains skip directive Change-Id: I5618c93952fddf599d3013a890311a95c20fff15
2019-07-02DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into ↵Xin Li
stage-aosp-master am: 2294953742 Change-Id: Ide78e508d46fdd6ef883b1fb541ad8a86a1bf25c
2019-07-01DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into ↵temp_140451723Xin Li
stage-aosp-master Bug: 134405016 Change-Id: I165847a78267e11e2a72f68a64750a9999af10ae
2019-05-03resolve merge conflicts of 47983a039473f3848647c93278e2d4ae9a5eff51 to ↵Haibo Huang
qt-dev-plus-aosp am: 6c8c7e7e4a Change-Id: I317d44c7bdca2bf92fb788cd01ef40696bf0d8a4
2019-05-03resolve merge conflicts of 47983a039473f3848647c93278e2d4ae9a5eff51 to ↵Haibo Huang
qt-dev-plus-aosp Exempt-From-Owner-Approval: Solve merge conflict Bug: None Test: I solemnly swear I tested this conflict resolution. Change-Id: Idc64b93a422757ad92113b2902908d96730c772e
2019-05-03Upgrade cn-cbor to f1cf9ffdf5cfab935a45900556f9b68af925c256Haibo Huang
am: b83f8d0e76 Change-Id: I28a293ef8aa056e46934cc85214a8a27eeb11cc2
2019-05-03Upgrade cn-cbor to f1cf9ffdf5cfab935a45900556f9b68af925c256Haibo Huang
Test: build Change-Id: I5f2b5af657a6cbe5c2527f6c5097b03160fc6346
2019-04-03Merge master@5428150 into git_qt-dev. am: 266d02b724Bill Rassieur
am: 731ce8305e Change-Id: I54cf00ca13a1c4793f7f219c432eac275cca8d1d
2019-04-03Merge master@5428150 into git_qt-dev-plus-aosp.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-releaseBill Rassieur
am: a153c76dd4 Change-Id: I1a81576712a178599522c74d865fc162809bdaf4
2019-04-03Merge master@5428150 into git_qt-dev.Bill Rassieur
am: 266d02b724 Change-Id: I3189e9811f230dbeb88813faa1fd39f0ab4ee671
2019-04-02Merge master@5428150 into git_qt-dev-plus-aosp.Bill Rassieur
Change-Id: I1593b7768d8c76217fb5d30a7459057595f82b25 BUG: 129345239
2019-04-02Merge master@5428150 into git_qt-dev.Bill Rassieur
Change-Id: Ia9a19cac4fe4af0f0e3e7fdf04e6d23bcfb33053 BUG: 129345239
2019-03-27Fixing the pointer cast for ntoh32p in cn-cborMax Bires
This line was incorrectly casting p to a long pointer rather than a 32 bit integer pointer. Bug: 113512324 Test: it's unused code. Change-Id: Ib296a2b20c7c13bd94b9c7f8b666c4d1213bbfcf
2019-02-24[automerger skipped] DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-masterXin Li
am: 794f4e997f -s ours am skip reason: subject contains skip directive Change-Id: Ib2a57b977070f96ffad51d712959e210f042ceed
2019-02-20DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-masterXin Li
Bug: 120848293 Change-Id: I8df011f82bc449c9b25401bb39253c787441a7df
2019-01-14Add default code reviewers into OWNERS am: 03dfd17ecc am: bb7c28409dChih-Hung Hsieh
am: 44f57f67d6 Change-Id: I247270545eb4104e6bae3c8cab0afd183a13ed9d
2019-01-14Add default code reviewers into OWNERS am: 03dfd17eccChih-Hung Hsieh
am: bb7c28409d Change-Id: I2ed14a507cde614e135a622aed64148717a291f7
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-18 03:44:16 +0000