aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2022-08-16Merge "compress: fix return value of is_codec_supported" am: 53414059ef am: ↵HEADandroid-14.0.0_r33android-14.0.0_r32android-14.0.0_r31android-14.0.0_r30android-14.0.0_r29android-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_r19android-14.0.0_r18android-14.0.0_r17android-14.0.0_r16aml_rkp_341510000aml_rkp_341311000aml_rkp_341114000aml_rkp_341015010aml_rkp_341012000aml_hef_341613000aml_hef_341512030aml_hef_341415040aml_hef_341311010aml_hef_341114030aml_cfg_341510000mastermainandroid14-qpr2-s3-releaseandroid14-qpr2-s2-releaseandroid14-qpr2-s1-releaseandroid14-qpr2-releaseandroid14-qpr1-s2-releaseandroid14-qpr1-releaseandroid14-mainline-healthfitness-releaseandroid14-devChristopher Ferris
6b6d429d1d am: 786c188d00 am: d7ff18e034 am: c532332a09 Original change: https://android-review.googlesource.com/c/platform/external/tinycompress/+/2167162 Change-Id: Iac50c4aacc7f20d2fdd0b7cd15204dff04873b57 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-15Merge "compress: fix return value of is_codec_supported" am: 53414059ef am: ↵android-u-beta-1-gplmain-16k-with-phonesChristopher Ferris
6b6d429d1d am: 786c188d00 am: d7ff18e034 Original change: https://android-review.googlesource.com/c/platform/external/tinycompress/+/2167162 Change-Id: Ie46cd9ba0b0acc98dc70d5c4914b2ffdbc8f37e4 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-15Merge "compress: fix return value of is_codec_supported" am: 53414059ef am: ↵Christopher Ferris
6b6d429d1d am: 786c188d00 Original change: https://android-review.googlesource.com/c/platform/external/tinycompress/+/2167162 Change-Id: I841ebce73c25d49d987976e1746fcf3d74931db1 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-15Merge "compress: fix return value of is_codec_supported" am: 53414059ef am: ↵Christopher Ferris
6b6d429d1d Original change: https://android-review.googlesource.com/c/platform/external/tinycompress/+/2167162 Change-Id: I51022071f010c6ee47bf313965044e82727f7195 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-15Merge "compress: fix return value of is_codec_supported" am: 53414059efmain-16kChristopher Ferris
Original change: https://android-review.googlesource.com/c/platform/external/tinycompress/+/2167162 Change-Id: Ia29cf7ff157a77a12111634eda413eb52453a236 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-15Merge "compress: fix return value of is_codec_supported"Christopher Ferris
2022-07-27compress: fix return value of is_codec_supportedJindong Yue
The function return type of oops() is int, which mismatches the boolean type of is_codec_supported. Signed-off-by: Jindong Yue <jindong.yue@nxp.com> Change-Id: I892f232d8fb61c8bf8238f55c39c1978436fdb10
2021-05-29Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/tinycompress" 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_330444000android-wear-13.0.0-gpl_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_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-releaseandroid-wear-13.0.0-gpl_r1aml_tz4_332714010Bob Badour
3a930cc474 am: efc77b356b am: dc32830263 am: f690ffd9a9 am: 1b05ea37e2 Original change: https://android-review.googlesource.com/c/platform/external/tinycompress/+/1588694 Change-Id: If1bb60f8670c1e3b09e25e12b5c1d72228166c43
2021-02-17Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/tinycompress" 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
3a930cc474 am: efc77b356b am: dc32830263 am: f690ffd9a9 Original change: https://android-review.googlesource.com/c/platform/external/tinycompress/+/1588694 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I3a09eb0c13f1209bb99b104d41a9d79f986147f5
2021-02-17Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/tinycompress" am: ↵Bob Badour
3a930cc474 am: efc77b356b am: dc32830263 am: f690ffd9a9 Original change: https://android-review.googlesource.com/c/platform/external/tinycompress/+/1588694 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I1cfd455d0f8c1ad0aae2f08f7dd3d569362db00f
2021-02-17Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/tinycompress" 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
3a930cc474 am: efc77b356b am: dc32830263 Original change: https://android-review.googlesource.com/c/platform/external/tinycompress/+/1588694 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I0a8b0e6dd5252a5c58bbbcbeefa762a201ab7d09
2021-02-17Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/tinycompress" am: ↵Bob Badour
3a930cc474 am: efc77b356b Original change: https://android-review.googlesource.com/c/platform/external/tinycompress/+/1588694 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ic4491ed6c3c41ec571b27e56994858a427b13b2e
2021-02-17Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/tinycompress" am: 3a930cc474android-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/tinycompress/+/1588694 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Id3222d1f0d38a06b4f7e9982d927661fce76bb41
2021-02-17Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/tinycompress"android-s-preview-1Bob Badour
2021-02-12[LSC] Add LOCAL_LICENSE_KINDS to external/tinycompressBob Badour
Added SPDX-license-identifier-BSD to: Android.bp Bug: 68860345 Bug: 151177513 Bug: 151953481 Test: m all Exempt-From-Owner-Approval: janitorial work Change-Id: I19d055d78a2c9227c8c521b65d3ff52efc591eca
2021-01-15[automerger skipped] Merge changes I3084f1e2,I7ea6a7bb,I71f588b9 am: ↵Eric Laurent
8bf575a845 am: 11cd3180a5 am: 107425320c -s ours am skip reason: Change-Id I3084f1e294d15a12923958af9170f00413fae2bb with SHA-1 533365793d is in history Original change: https://android-review.googlesource.com/c/platform/external/tinycompress/+/1551056 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I58b29a942dcecb691921762868339327f8d32fa1
2021-01-15[automerger skipped] tinycompress: Fix error handling in plugins. am: ↵Vidyakumar Athota
fc8976c893 am: 961c9afd6b am: b45e6a49fe -s ours am skip reason: Change-Id I7ea6a7bb712367546607b8d7985cc4de8ca2455f with SHA-1 f86d1a2e03 is in history Original change: https://android-review.googlesource.com/c/platform/external/tinycompress/+/1551055 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I565780238089c4d06121308e22aa75eb89aabd9d
2021-01-15[automerger skipped] external: tinycompress: add support for compress ↵Vidyakumar Athota
plugins am: 2b8db68d31 am: 93ef2fc37e am: b2de43cbb5 -s ours am skip reason: Change-Id I71f588b9ed84b62d3b1b08dae7ce65f8fa649e6a with SHA-1 931e7cf24b is in history Original change: https://android-review.googlesource.com/c/platform/external/tinycompress/+/1551054 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I712fee58aafd59eff290c5a07b702eb051c31191
2021-01-15Merge changes I3084f1e2,I7ea6a7bb,I71f588b9 am: 8bf575a845 am: 11cd3180a5Eric Laurent
Original change: https://android-review.googlesource.com/c/platform/external/tinycompress/+/1551056 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I64897a55b9c9759af84f50be737d107915408e0b
2021-01-15tinycompress: Fix error handling in plugins. am: fc8976c893 am: 961c9afd6bVidyakumar Athota
Original change: https://android-review.googlesource.com/c/platform/external/tinycompress/+/1551055 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I19206f006ba5de110af0edf66b501b8bb15867e8
2021-01-15external: tinycompress: add support for compress plugins am: 2b8db68d31 am: ↵Vidyakumar Athota
93ef2fc37e Original change: https://android-review.googlesource.com/c/platform/external/tinycompress/+/1551054 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I2f45e92010dff2ac1504ac11f8318862474e31a4
2021-01-15Merge changes I3084f1e2,I7ea6a7bb,I71f588b9 am: 8bf575a845Eric Laurent
Original change: https://android-review.googlesource.com/c/platform/external/tinycompress/+/1551056 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ib472495de7591bd275fe7e359ed76db991389907
2021-01-15tinycompress: Fix error handling in plugins. am: fc8976c893Vidyakumar Athota
Original change: https://android-review.googlesource.com/c/platform/external/tinycompress/+/1551055 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I7ac79de119bcd9d9832d852730b3de960c815e49
2021-01-15external: tinycompress: add support for compress plugins am: 2b8db68d31Vidyakumar Athota
Original change: https://android-review.googlesource.com/c/platform/external/tinycompress/+/1551054 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ic328a6cc70625d9163082c39fc251e524aa409cc
2021-01-15Merge changes I3084f1e2,I7ea6a7bb,I71f588b9Eric Laurent
* changes: fix build tinycompress: Fix error handling in plugins. external: tinycompress: add support for compress plugins
2021-01-14Merge "update OWNERS" am: b15cd11aa6 am: 510c32de34 am: f5e92449a1Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/external/tinycompress/+/1550784 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ia1da28e9a2862f0058a1341f07ebebadc6151407
2021-01-14Merge "update OWNERS" am: b15cd11aa6 am: 510c32de34Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/external/tinycompress/+/1550784 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ib5f4a607834761a3b5da436e63b741fc6f5fb218
2021-01-14Merge "update OWNERS" am: b15cd11aa6Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/external/tinycompress/+/1550784 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I710cedd0cf0ba8ac26983eb4b455dfea7447a611
2021-01-14fix buildEric Laurent
Fix build breakage introduced by commit f86d1a2e with strlcpy argument checks. Test: make checkbuild Change-Id: I3084f1e294d15a12923958af9170f00413fae2bb Merged-In: I3084f1e294d15a12923958af9170f00413fae2bb
2021-01-14tinycompress: Fix error handling in plugins.Vidyakumar Athota
Bug: 166667071 Test: manual offload playback Test: cts AudioTrackOffloadTest CRs-Fixed: 2608556 Change-Id: I7ea6a7bb712367546607b8d7985cc4de8ca2455f Merged-In: I7ea6a7bb712367546607b8d7985cc4de8ca2455f
2021-01-14external: tinycompress: add support for compress pluginsVidyakumar Athota
Add plugin support to use vendor specific compress implementation Bug: 166667071 Test: manual offload playback test Test: cts AudioTrackOffloadTest CRs-Fixed: 2563258 Change-Id: I71f588b9ed84b62d3b1b08dae7ce65f8fa649e6a Merged-In: I71f588b9ed84b62d3b1b08dae7ce65f8fa649e6a
2021-01-14Merge "update OWNERS"Treehugger Robot
2021-01-14update OWNERSEric Laurent
Test: make Change-Id: Ifd2b023b9dcc7efee7528908b803a6882654ec54
2021-01-13fix buildEric Laurent
Fix build breakage introduced by commit f86d1a2e with strlcpy argument checks. Test: make checkbuild Change-Id: I3084f1e294d15a12923958af9170f00413fae2bb
2021-01-13Revert "Revert "tinycompress: Fix error handling in plugins.""Eric Laurent
This reverts commit d655935a89e1474d99eb18a8e2bc1a066e1734bf. Test: make Change-Id: I95016c6e542de7e3bcba4a239ec2765b841dcfc5
2021-01-13Revert "tinycompress: Fix error handling in plugins."Eric Laurent
This reverts commit f86d1a2e03fcc6876d7f0e27e2a2f394963b7ae2. Reason for revert: b/177399104 Change-Id: I672a5f667918df3d2ffdf43cd152d710c7806555
2020-12-10tinycompress: Fix error handling in plugins.Vidyakumar Athota
Bug: 166667071 Test: manual offload playback Test: cts AudioTrackOffloadTest CRs-Fixed: 2608556 Change-Id: I7ea6a7bb712367546607b8d7985cc4de8ca2455f
2020-12-10external: tinycompress: add support for compress pluginsVidyakumar Athota
Add plugin support to use vendor specific compress implementation Bug: 166667071 Test: manual offload playback test Test: cts AudioTrackOffloadTest CRs-Fixed: 2563258 Change-Id: I71f588b9ed84b62d3b1b08dae7ce65f8fa649e6a
2020-05-05Merge "Add METADATA to tinycompress: BSD+Apache2=NOTICE" am: c67917c054 am: ↵Treehugger Robot
f7b937d32d am: f8aef8a8cd am: cd8f58f5a7 am: fb35294759 Change-Id: I7aa7fb2886a7378651778d801486b4f2eccd25e5
2020-05-05Merge "Add METADATA to tinycompress: BSD+Apache2=NOTICE" am: c67917c054 am: ↵Treehugger Robot
f7b937d32d am: f8aef8a8cd am: cd8f58f5a7 Change-Id: Ib0dd034352ce71bf763cd61cb1d7c4f72611e522
2020-05-05Merge "Add METADATA to tinycompress: BSD+Apache2=NOTICE" am: c67917c054 am: ↵Treehugger Robot
f7b937d32d am: f8aef8a8cd Change-Id: I5b9ccef1776ec82a3149e25f93977a9c224aa728
2020-05-05Merge "Add METADATA to tinycompress: BSD+Apache2=NOTICE" am: c67917c054 am: ↵Treehugger Robot
f7b937d32d Change-Id: I41968e3eed821160f491271b1ac4cebb5a747377
2020-05-05Merge "Add METADATA to tinycompress: BSD+Apache2=NOTICE" am: c67917c054android-r-beta-3android-r-beta-2Treehugger Robot
Change-Id: If7f6d4779070539ddfa9735af5d4c538fd12b06c
2020-05-05Merge "Add METADATA to tinycompress: BSD+Apache2=NOTICE"Treehugger Robot
2020-05-05Add METADATA to tinycompress: BSD+Apache2=NOTICEBob Badour
Bug: 68860345 Bug: 69058154 Bug: 151953481 Test: no code changes Exempt-From-Owner-Approval: janitorial work Change-Id: I99ecc0ab59dd7e1ba61a6d4e41274f9289c6eb6e
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: 65450e5be4 am: 0d22775e99 -s ours am skip reason: subject contains skip directive Change-Id: Ifbf421ee8a3e07f760e3311b36b67750fff2e21b
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: 65450e5be4 Change-Id: I26ef047ba9a503aa8c5ebe057e95954aaf33c396
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: I2708a14e53513cbfb09c9272ccb478634bdad2ab
2019-09-08[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into ↵Xin Li
stage-aosp-master am: b0e3446028 -s ours am: bd6e32c578 -s ours am: 6a1367ef9e -s ours am skip reason: change_id I9d37ecefcc91ebab3bc798d0deed9e924ca828d3 with SHA1 9b99e6a8ea is in history Change-Id: Ib40a4a0ccc62bca1733a4855e6123def982ed210
2019-09-08[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into ↵Xin Li
stage-aosp-master am: b0e3446028 -s ours am: bd6e32c578 -s ours am skip reason: change_id I9d37ecefcc91ebab3bc798d0deed9e924ca828d3 with SHA1 9b99e6a8ea is in history Change-Id: Icef0efbb3fea71bc4060609783c414995c59b927
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-07 17:53:21 +0000