aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2022-03-04Merge "Move comment to license_note" am: 042e6217db am: 909c4f3e4a am: ↵t_frc_odp_330442040t_frc_odp_330442000t_frc_ase_330444010android-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_go_odp_330912000aml_go_ads_330915100aml_go_ads_330915000aml_go_ads_330913000android13-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-go-adservices-releaseandroid13-frc-odp-releaseandroid13-devandroid13-d4-s2-releaseandroid13-d4-s1-releaseandroid13-d4-releaseandroid13-d3-s1-releaseandroid13-d2-releaseTreehugger Robot
47b00c8076 Original change: https://android-review.googlesource.com/c/platform/external/flac/+/2007802 Change-Id: I53c39ed24fe4e0404a0c700c683ca766d9237b18
2022-03-04Merge "Move comment to license_note" am: 042e6217db am: 909c4f3e4aTreehugger Robot
Original change: https://android-review.googlesource.com/c/platform/external/flac/+/2007802 Change-Id: Ie13c41268a0625304c55fa63f66ca41dadb362ec
2022-03-04Merge "Move comment to license_note" am: 042e6217dbTreehugger Robot
Original change: https://android-review.googlesource.com/c/platform/external/flac/+/2007802 Change-Id: I70323e7d2e46b44b68702e5c9ba174d2ad78195d
2022-03-04Merge "Move comment to license_note"Treehugger Robot
2022-03-03Move comment to license_noteBob Badour
Comments not preserved during refresh. Test: m nothing Change-Id: I9576e52d6662e772d9a3476edf0b0c6d5b15c8de
2022-01-26Add explicit apex_available clausesRay Essick
So we can delete the list automatically added within the tools. Bug: 215589022 Test: build (with implied list cleared in work tree) Change-Id: Iba17f317e8dab16cff0a40e03904c480dab312ee
2021-11-05libFLAC: Restrict number of bytes in a frame am: 477e6aca1eNeelkamal Semwal
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/flac/+/16033407 Change-Id: I371150b7da19c106607e1ff00df103f2a404c05c
2021-10-11libFLAC: Restrict number of bytes in a frameNeelkamal Semwal
Bug: 170738121 Test: POC in bug descriptions Change-Id: I177537ed1b54cb1d61ea8d75203637cecc594696
2021-10-08[automerger skipped] Merge "Merge Android 12" am: 2e68054f9c -s ours am: ↵Xin Li
44afe8eefc -s ours am: 61516b14e7 -s ours am: 75c4bac5fb -s ours am: 4271373a65 -s ours am skip reason: Merged-In I7cd7021ec32823bc87ddce98e10158af4fcc1f3c with SHA-1 7822d86cc4 is already in history Original change: https://android-review.googlesource.com/c/platform/external/flac/+/1847356 Change-Id: I3dfea71b11d9d0686931a741d52a0db8d4e55cff
2021-10-08[automerger skipped] Merge "Merge Android 12" am: 2e68054f9c -s ours am: ↵Xin Li
44afe8eefc -s ours am: 61516b14e7 -s ours am: 75c4bac5fb -s ours am skip reason: Merged-In I7cd7021ec32823bc87ddce98e10158af4fcc1f3c with SHA-1 7822d86cc4 is already in history Original change: https://android-review.googlesource.com/c/platform/external/flac/+/1847356 Change-Id: Ic1dc7a1cedb9dc5706b3fbb9c22a2739467a0139
2021-10-08[automerger skipped] Merge "Merge Android 12" am: 2e68054f9c -s ours am: ↵android-t-preview-2android-t-preview-1android-t-beta-3android-s-v2-beta-3android-s-qpr3-beta-1android-t-preview-1android-s-v2-beta-3android-s-qpr3-beta-1Xin Li
44afe8eefc -s ours am: 61516b14e7 -s ours am skip reason: Merged-In I7cd7021ec32823bc87ddce98e10158af4fcc1f3c with SHA-1 7822d86cc4 is already in history Original change: https://android-review.googlesource.com/c/platform/external/flac/+/1847356 Change-Id: Icb2f09cd691c1be59a8680eb256d670ce740f57a
2021-10-08[automerger skipped] Merge "Merge Android 12" am: 2e68054f9c -s ours am: ↵Xin Li
44afe8eefc -s ours am skip reason: Merged-In I7cd7021ec32823bc87ddce98e10158af4fcc1f3c with SHA-1 7822d86cc4 is already in history Original change: https://android-review.googlesource.com/c/platform/external/flac/+/1847356 Change-Id: Ie544f211e95dc4ad437eface84003bc5e3b70a88
2021-10-08[automerger skipped] Merge "Merge Android 12" am: 2e68054f9c -s oursXin Li
am skip reason: Merged-In I7cd7021ec32823bc87ddce98e10158af4fcc1f3c with SHA-1 7822d86cc4 is already in history Original change: https://android-review.googlesource.com/c/platform/external/flac/+/1847356 Change-Id: Ic41232477df9fbc36127246a2f5b4b5d0df94963
2021-10-07Merge "Merge Android 12"android-s-v2-preview-2android-s-v2-preview-1android-s-v2-beta-2android-s-v2-preview-1Xin Li
2021-10-06Merge Android 12Xin Li
Bug: 202323961 Merged-In: I7cd7021ec32823bc87ddce98e10158af4fcc1f3c Change-Id: I67407cdf769d6442d155b7a87b87693edead3683
2021-09-23Merge "libFLAC: Restrict number of bytes in a frame" am: 7f77aa6650 am: ↵Ray Essick
7822d86cc4 am: 2c553680c1 am: 45927bb53a am: 9a481e5398 Original change: https://android-review.googlesource.com/c/platform/external/flac/+/1770797 Change-Id: Ia1e6b3558c33f9e23ba209af3f758257010f354e
2021-09-23Merge "libFLAC: Restrict number of bytes in a frame" am: 7f77aa6650 am: ↵Ray Essick
7822d86cc4 am: 2c553680c1 am: 45927bb53a Original change: https://android-review.googlesource.com/c/platform/external/flac/+/1770797 Change-Id: Id5a0168ef521561f890cb95ec21c3cd6caa521b2
2021-09-23Merge "libFLAC: Restrict number of bytes in a frame" am: 7f77aa6650 am: ↵Ray Essick
7822d86cc4 am: 2c553680c1 Original change: https://android-review.googlesource.com/c/platform/external/flac/+/1770797 Change-Id: I72bc20c5ae6694ec3e33164047c8219fbd6baedf
2021-09-23Merge "libFLAC: Restrict number of bytes in a frame" am: 7f77aa6650 am: ↵Ray Essick
7822d86cc4 Original change: https://android-review.googlesource.com/c/platform/external/flac/+/1770797 Change-Id: If2443a9cfa9d0a0b6a09cb4cd9ef2009e901a525
2021-09-23Merge "libFLAC: Restrict number of bytes in a frame" am: 7f77aa6650temp_sam_202323961Ray Essick
Original change: https://android-review.googlesource.com/c/platform/external/flac/+/1770797 Change-Id: I7cd7021ec32823bc87ddce98e10158af4fcc1f3c
2021-09-23Merge "libFLAC: Restrict number of bytes in a frame"Ray Essick
2021-08-18[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: ↵Xin Li
ba4d8e5655 -s ours am: ed0b34b314 -s ours am: f63f1c9e6d -s ours am: 980fb25355 -s ours am skip reason: Merged-In I175b9acffb34c8934d2f6f95194c3efd349371a0 with SHA-1 deb7da7583 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/flac/+/15571804 Change-Id: I84d604235dfe3e1f9995529c5aad1e576570fd77
2021-08-17[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: ↵Xin Li
ba4d8e5655 -s ours am: ed0b34b314 -s ours am: f63f1c9e6d -s ours am skip reason: Merged-In I175b9acffb34c8934d2f6f95194c3efd349371a0 with SHA-1 deb7da7583 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/flac/+/15571804 Change-Id: Idf445bfcf8e908cbc351ab939a52a65adece76b6
2021-08-17[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: ↵Xin Li
ba4d8e5655 -s ours am: ed0b34b314 -s ours am skip reason: Merged-In I175b9acffb34c8934d2f6f95194c3efd349371a0 with SHA-1 deb7da7583 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/flac/+/15571804 Change-Id: Idbc27b5192b21cd72b4104d156405d5e2d66c168
2021-08-17[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: ↵Xin Li
ba4d8e5655 -s ours am skip reason: Merged-In I175b9acffb34c8934d2f6f95194c3efd349371a0 with SHA-1 deb7da7583 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/flac/+/15571804 Change-Id: I3df54fc6b96b60722b4e5ef89724e13512a0b680
2021-08-14Merge sc-dev-plus-aosp-without-vendor@7634622Xin Li
Merged-In: I175b9acffb34c8934d2f6f95194c3efd349371a0 Change-Id: I49acdc5e1faae55076153904ca3c9f09c791194b
2021-08-09libFLAC: Restrict number of bytes in a frameNeelkamal Semwal
Bug: 170738121 Test: POC in bug descriptions Change-Id: I177537ed1b54cb1d61ea8d75203637cecc594696
2021-06-18[automerger skipped] DO NOT MERGE - Mark RQ3A.210410.001 as merged am: ↵Xin Li
f99cd7c371 -s ours am: deb7da7583 -s ours am: 4e6e9e0769 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/external/flac/+/15024072 Change-Id: I0de7f3cbf6a17a526afbca7d78c3ce5151d885e2
2021-06-18[automerger skipped] DO NOT MERGE - Mark RQ3A.210410.001 as merged am: ↵Xin Li
f99cd7c371 -s ours am: deb7da7583 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/external/flac/+/15024072 Change-Id: Ibc0867da1b4eee51fdadc01030d510deb49a0eac
2021-06-18[automerger skipped] DO NOT MERGE - Mark RQ3A.210410.001 as merged am: ↵Xin Li
f99cd7c371 -s ours am skip reason: Merged-In Icf9326dbbdfd1798fb6cb28fea2548830d853b88 with SHA-1 05a29b79af is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/flac/+/15024072 Change-Id: I175b9acffb34c8934d2f6f95194c3efd349371a0
2021-06-17DO NOT MERGE - Mark RQ3A.210410.001 as mergedandroid-s-beta-5android-s-beta-4android-s-beta-3android-s-beta-5android-s-beta-4Xin Li
Bug: 190855093 Merged-In: Icf9326dbbdfd1798fb6cb28fea2548830d853b88 Change-Id: I11b8feeeded63258a969a3e7a718555c330e26f2
2021-06-14[automerger skipped] Merge "DO NOT MERGE - Merge ab/7272582" am: d7b1f19acc ↵Treehugger Robot
am: 05a29b79af am: 682a93dd83 -s ours am: 5687643fcc -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/external/flac/+/1736023 Change-Id: I550f611341d458ba7e27453b0b47fc97a72bd7d2
2021-06-14[automerger skipped] DO NOT MERGE - Merge ab/7272582 am: af0ba3e5e2 am: ↵Xin Li
a326dce74c am: 81fb48abde -s ours am: a54d9901b3 -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/external/flac/+/1736023 Change-Id: Ic0a9e634ef2230d8fad5557337b991185c998443
2021-06-14[automerger skipped] Merge "DO NOT MERGE - Merge ab/7272582" am: d7b1f19acc ↵Treehugger Robot
am: 05a29b79af am: 682a93dd83 -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/external/flac/+/1736023 Change-Id: I6f1e3cd163e8035599eee0b54c60e86cd57ce0cc
2021-06-14[automerger skipped] DO NOT MERGE - Merge ab/7272582 am: af0ba3e5e2 am: ↵Xin Li
a326dce74c am: 81fb48abde -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/external/flac/+/1736023 Change-Id: I8f16553b2f56611e2ae666604a8687084cf1342e
2021-06-14Merge "DO NOT MERGE - Merge ab/7272582" am: d7b1f19acc am: 05a29b79afTreehugger Robot
Original change: https://android-review.googlesource.com/c/platform/external/flac/+/1736023 Change-Id: I0a48e8105a5873ca76b3ff028245ab842ba3fa3e
2021-06-14DO NOT MERGE - Merge ab/7272582 am: af0ba3e5e2 am: a326dce74cXin Li
Original change: https://android-review.googlesource.com/c/platform/external/flac/+/1736023 Change-Id: I328d121af6eab9ad0431914bd4c2df7de2bdc7f6
2021-06-14Merge "DO NOT MERGE - Merge ab/7272582" am: d7b1f19accTreehugger Robot
Original change: https://android-review.googlesource.com/c/platform/external/flac/+/1736023 Change-Id: Icf9326dbbdfd1798fb6cb28fea2548830d853b88
2021-06-14DO NOT MERGE - Merge ab/7272582 am: af0ba3e5e2Xin Li
Original change: https://android-review.googlesource.com/c/platform/external/flac/+/1736023 Change-Id: Id361103d6966c72d99076e9971fb8b4337efcaf6
2021-06-14Merge "DO NOT MERGE - Merge ab/7272582"Treehugger Robot
2021-06-11DO NOT MERGE - Merge ab/7272582Xin Li
Bug: 190855093 Change-Id: I6bd699e15d59e01f86f322c991939819db0ca0b0
2021-06-02Merge sc-mainline-prodXin Li
Bug: 189946434 Change-Id: Ibf6414224b459138126c45de82f839377ab9044e
2021-03-26[automerger skipped] Merge "libFLAC: Fix divide by zero error in ↵android-mainline-12.0.0_r5android-mainline-12.0.0_r39android-mainline-12.0.0_r22android-mainline-12.0.0_r19TreeHugger Robot
FLAC__stream_decoder_seek_absolute" into mainline-prod am: ae3bb26fa7 -s ours am: 0b6bbbaee9 -s ours am skip reason: skip tag Change-Id I9165ae7fd4ddeba1d1b46203ef1256915c9f4add with SHA-1 5bd2e7aba1 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/flac/+/13868219 Change-Id: Icf38d7477f29a86197028bb9d6a48f7755a92a42
2021-03-26[automerger skipped] Merge "libFLAC: Fix divide by zero error in ↵TreeHugger Robot
FLAC__stream_decoder_seek_absolute" into mainline-prod am: ae3bb26fa7 -s ours am: 0b6bbbaee9 -s ours am skip reason: skip tag Change-Id I9165ae7fd4ddeba1d1b46203ef1256915c9f4add with SHA-1 5bd2e7aba1 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/flac/+/13868219 Change-Id: I454bd64c04eccd537d9ce234cd79a33ceebaa1d5
2021-03-26[automerger skipped] Merge "libFLAC: Fix divide by zero error in ↵android-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-devTreeHugger Robot
FLAC__stream_decoder_seek_absolute" into mainline-prod am: ae3bb26fa7 -s ours am skip reason: skip tag Change-Id I9165ae7fd4ddeba1d1b46203ef1256915c9f4add with SHA-1 5bd2e7aba1 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/flac/+/13868219 Change-Id: I049346fea39c25e0b4e44190da583c0b2d079303
2021-03-26Merge "libFLAC: Fix divide by zero error in ↵TreeHugger Robot
FLAC__stream_decoder_seek_absolute" into mainline-prod
2021-03-18Snap for 7218778 from 368eb3f5bec249a197c95a95583ff8153aa6a87f to ↵android-11.0.0_r46android-11.0.0_r43android-11.0.0_r40android-11.0.0_r39android-11.0.0_r38android11-qpr3-s1-releaseandroid11-qpr3-releaseandroid-build-team Robot
rvc-qpr3-release Change-Id: I0c4a02546bd0a0b71fbf25247ccc11963d8707a1
2021-03-18[automerger skipped] Merge "libFlac: Exit at EOS in verify mode" into ↵TreeHugger Robot
mainline-prod am: 7d568fcd87 -s ours am: c832307ed3 -s ours am skip reason: skip tag Change-Id I6d02103f58b86c303b05b312568382ce88e6b73c with SHA-1 368eb3f5be is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/flac/+/13575732 Change-Id: I66a960a8935e7ebb71d7a188817aa2cf2f001c24
2021-03-18[automerger skipped] Merge "libFlac: Exit at EOS in verify mode" into ↵TreeHugger Robot
mainline-prod am: 7d568fcd87 -s ours am: c832307ed3 -s ours am skip reason: skip tag Change-Id I6d02103f58b86c303b05b312568382ce88e6b73c with SHA-1 368eb3f5be is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/flac/+/13575732 Change-Id: I99719519b14dd48c0fa85582e0816348f82f368b
2021-03-18[automerger skipped] Merge "libFlac: Exit at EOS in verify mode" into ↵TreeHugger Robot
mainline-prod am: 7d568fcd87 -s ours am skip reason: skip tag Change-Id I6d02103f58b86c303b05b312568382ce88e6b73c with SHA-1 368eb3f5be is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/flac/+/13575732 Change-Id: Ic1c0855b390b8d378f73344f16a157f2b9574105
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-11 00:25:18 +0000