aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2020-09-12Merge "Include a shared media team OWNERS for easier management" am: ↵Treehugger Robot
25b026649d am: 195f4172fb am: 9276573104 am: eb4bfd4b60 Original change: https://android-review.googlesource.com/c/platform/external/libvpx/+/1392881 Change-Id: I2b14fda449101282e769005284940f72c823ff9e
2020-09-12Merge "Include a shared media team OWNERS for easier management" am: ↵Treehugger Robot
25b026649d am: 195f4172fb am: 9276573104 Original change: https://android-review.googlesource.com/c/platform/external/libvpx/+/1392881 Change-Id: Ic7a934f204b6dec39a12a6276f88050f5bf115d5
2020-09-12Merge "Include a shared media team OWNERS for easier management" am: ↵Treehugger Robot
25b026649d am: 195f4172fb Original change: https://android-review.googlesource.com/c/platform/external/libvpx/+/1392881 Change-Id: I0f91550f32e189ccd2159d7da549517a56d30dad
2020-09-12Merge "Include a shared media team OWNERS for easier management" am: 25b026649dTreehugger Robot
Original change: https://android-review.googlesource.com/c/platform/external/libvpx/+/1392881 Change-Id: I6d90c003fb5f32f361abac59063eceaff8641b0f
2020-09-12Merge "Include a shared media team OWNERS for easier management"Treehugger Robot
2020-09-11[automerger skipped] Merge "Merge Android R" am: 5ad2f87792 -s ours am: ↵Xin Li
c711e9eb88 -s ours am: ffad11701d -s ours am: 7183446d6d -s ours am: 09a6a33d6f -s ours am skip reason: Change-Id I908ebc0537b77bd31f31e259d3edf20647a5e7bb with SHA-1 2a57937f96 is in history Original change: https://android-review.googlesource.com/c/platform/external/libvpx/+/1422378 Change-Id: Iab05a5a28f1e09b8cd90a85abee807876ebc03c3
2020-09-11[automerger skipped] Merge "Merge Android R" am: 5ad2f87792 -s ours am: ↵Xin Li
c711e9eb88 -s ours am: ffad11701d -s ours am: 7183446d6d -s ours am skip reason: Change-Id I908ebc0537b77bd31f31e259d3edf20647a5e7bb with SHA-1 2a57937f96 is in history Original change: https://android-review.googlesource.com/c/platform/external/libvpx/+/1422378 Change-Id: If7aaf9bbd5ca3790cac021f08fffbf2fe9966954
2020-09-11[automerger skipped] Merge "Merge Android R" am: 5ad2f87792 -s ours am: ↵Xin Li
c711e9eb88 -s ours am: ffad11701d -s ours am skip reason: Change-Id I908ebc0537b77bd31f31e259d3edf20647a5e7bb with SHA-1 2a57937f96 is in history Original change: https://android-review.googlesource.com/c/platform/external/libvpx/+/1422378 Change-Id: If686afc89dc60add6810e47eb87b036a98d3a734
2020-09-11[automerger skipped] Merge "Merge Android R" am: 5ad2f87792 -s ours am: ↵Xin Li
c711e9eb88 -s ours am skip reason: Change-Id I908ebc0537b77bd31f31e259d3edf20647a5e7bb with SHA-1 2a57937f96 is in history Original change: https://android-review.googlesource.com/c/platform/external/libvpx/+/1422378 Change-Id: If3417e94c26ff3c62276fab3cd4e78b38cfdc3f0
2020-09-11[automerger skipped] Merge "Merge Android R" am: 5ad2f87792 -s oursXin Li
am skip reason: Change-Id I908ebc0537b77bd31f31e259d3edf20647a5e7bb with SHA-1 2a57937f96 is in history Original change: https://android-review.googlesource.com/c/platform/external/libvpx/+/1422378 Change-Id: I48c06ba3ad76fd9243e619857f1dea1dfe7f53da
2020-09-10Merge "Merge Android R"Xin Li
2020-09-08Merge Android RXin Li
Bug: 168057903 Merged-In: I908ebc0537b77bd31f31e259d3edf20647a5e7bb Change-Id: I27d749a94e8cf16beb9dd2eb7eeee6392058943a
2020-09-02[automerger skipped] Merge Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) am: 2a57937f96 -s ours am: 1aae6d66fc -s ours am: dbc6fdd76b -s ours am: 4e6be27a08 -s ours am skip reason: Change-Id Id8ad6ce0b8f22cff73bff3c34f092021d99158bd with SHA-1 08590b8f33 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/libvpx/+/12470074 Change-Id: I5c30fa5d4880fdcb2652d094a25f4be7026fd2c4
2020-09-01[automerger skipped] Merge Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) am: 2a57937f96 -s ours am: 1aae6d66fc -s ours am: dbc6fdd76b -s ours am skip reason: Change-Id Id8ad6ce0b8f22cff73bff3c34f092021d99158bd with SHA-1 08590b8f33 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/libvpx/+/12470074 Change-Id: Ic0c75d7e6e7bfb1e7b76cecea30a6ad18a3fdd5e
2020-09-01[automerger skipped] Merge Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) am: 2a57937f96 -s ours am: 1aae6d66fc -s ours am skip reason: Change-Id Id8ad6ce0b8f22cff73bff3c34f092021d99158bd with SHA-1 08590b8f33 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/libvpx/+/12470074 Change-Id: If53ae98f3cf07a19a1c7cfdceaddbca671f816d3
2020-09-01[automerger skipped] Merge Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) am: 2a57937f96 -s ours am skip reason: Change-Id Id8ad6ce0b8f22cff73bff3c34f092021d99158bd with SHA-1 08590b8f33 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/libvpx/+/12470074 Change-Id: Iadfbff043e25d5577c8d6cb6d1e383ca77cc0fc3
2020-08-27Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)temp_sam_168057903Xin Li
Bug: 166295507 Merged-In: Id8ad6ce0b8f22cff73bff3c34f092021d99158bd Change-Id: I908ebc0537b77bd31f31e259d3edf20647a5e7bb
2020-08-25Include a shared media team OWNERS for easier managementRay Essick
Bug: 162786146 Test: build Change-Id: If5282706d8ce5f498bfd67efed44673ca4335f2a
2020-07-31Merge "Use blocklist sub-property in sanitize" am: 0d0c74a487 am: 667129de58 ↵Treehugger Robot
am: 369bcd4b99 am: c6b67bce25 am: 8906ee6548 Original change: https://android-review.googlesource.com/c/platform/external/libvpx/+/1374719 Change-Id: Iab224782f7a3406e06a965f00642b97d2b869b67
2020-07-31Merge "Use blocklist sub-property in sanitize" am: 0d0c74a487 am: 667129de58 ↵Treehugger Robot
am: 369bcd4b99 am: c6b67bce25 Original change: https://android-review.googlesource.com/c/platform/external/libvpx/+/1374719 Change-Id: I77de992ef5a700292998c083d795b6b5b5038d8c
2020-07-31Merge "Use blocklist sub-property in sanitize" am: 0d0c74a487 am: 667129de58 ↵Treehugger Robot
am: 369bcd4b99 Original change: https://android-review.googlesource.com/c/platform/external/libvpx/+/1374719 Change-Id: I2a724f57398b0b17fdf5a86877d12c154933fc3d
2020-07-31Merge "Use blocklist sub-property in sanitize" am: 0d0c74a487 am: 667129de58Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/external/libvpx/+/1374719 Change-Id: I8c1657c0f59ce38c250cda36f3a70c9d73ed9b9a
2020-07-31Merge "Use blocklist sub-property in sanitize" am: 0d0c74a487Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/external/libvpx/+/1374719 Change-Id: Iba7681badfdad0e8ef8610802a7a829db3b11866
2020-07-31Merge "Use blocklist sub-property in sanitize"Treehugger Robot
2020-07-28Use blocklist sub-property in sanitizePirama Arumuga Nainar
Update language to comply with Android’s inclusive language guidance See https://source.android.com/setup/contribute/respectful-code for reference Bug: 161896447 Bug: 162245450 Test: build topic Change-Id: I6837acd4a1e581625d2b0ca05fcb186bd053aaf3
2020-07-10libwebm: Pull from upstreamJames Zern
Current HEAD: 11cae244cc06c1295bffa9861c610dcde3b9da18 git log from upstream: 11cae24 webm_info: fix clang -Wdangling-gsl warning 3678196 Merge "mkvparser,VideoTrack: free m_colour_space in dtor" 2e3c97b webm_info,PrintVP9Info: quiet -Wsign-compare warning 06683f2 webm_info: output VP9 row tile info 3940f5f mkvparser,VideoTrack: free m_colour_space in dtor 9690075 mkvparser,VideoTrack::Parse: fix leak on error 9020ef4 Merge "Add a CMake install step for webm_parser." 40da750 Add a CMake install step for webm_parser. b6263e7 mkvparser: reject files w/multiple ProjectionPrivate 5be44a2 webm_parser,README.md: fix sample code namespace refs 37d9b86 webm_info: remove unneeded const qualifiers in casts f4121f6 mkvmuxerutil: remove unneeded const qualifier in cast Bug: 160236538 Bug: 157358489 Change-Id: I4f2125f2e6cf903dfb808d7d620659a83d2b3640 Test: upstream fuzzer coverage, compiles for sargo-userdebug
2020-06-08[automerger skipped] Merge "Merge QQ3A.200605.002 into master" am: ↵Xin Li
d53de42576 -s ours am: c02db1513a -s ours am: 08590b8f33 -s ours am: 3aa6565c9b -s ours am: ab139a2e5c -s ours am skip reason: Change-Id I263d2ccbf736e437ba320d6283264a18df12ef12 with SHA-1 9c588caba6 is in history Original change: https://android-review.googlesource.com/c/platform/external/libvpx/+/1323310 Change-Id: Iea5e0acbab8ccd9ac23131342d3545283257ee2f
2020-06-08[automerger skipped] Merge "Merge QQ3A.200605.002 into master" am: ↵Xin Li
d53de42576 -s ours am: c02db1513a -s ours am: 08590b8f33 -s ours am: 3aa6565c9b -s ours am skip reason: Change-Id I263d2ccbf736e437ba320d6283264a18df12ef12 with SHA-1 9c588caba6 is in history Original change: https://android-review.googlesource.com/c/platform/external/libvpx/+/1323310 Change-Id: I1d1be0d93bd10713fa923670529c21a73113f28b
2020-06-08[automerger skipped] Merge "Merge QQ3A.200605.002 into master" am: ↵Xin Li
d53de42576 -s ours am: c02db1513a -s ours am: 08590b8f33 -s ours am skip reason: Change-Id I263d2ccbf736e437ba320d6283264a18df12ef12 with SHA-1 9c588caba6 is in history Original change: https://android-review.googlesource.com/c/platform/external/libvpx/+/1323310 Change-Id: I8d62e5510f3c60abe6ef9bdcc9f5b392d2d945e4
2020-06-08[automerger skipped] Merge "Merge QQ3A.200605.002 into master" am: ↵Xin Li
d53de42576 -s ours am: c02db1513a -s ours am skip reason: Change-Id I263d2ccbf736e437ba320d6283264a18df12ef12 with SHA-1 9c588caba6 is in history Original change: https://android-review.googlesource.com/c/platform/external/libvpx/+/1323310 Change-Id: Id8ad6ce0b8f22cff73bff3c34f092021d99158bd
2020-06-08[automerger skipped] Merge "Merge QQ3A.200605.002 into master" am: ↵Xin Li
d53de42576 -s ours am skip reason: Change-Id I263d2ccbf736e437ba320d6283264a18df12ef12 with SHA-1 9c588caba6 is in history Original change: https://android-review.googlesource.com/c/platform/external/libvpx/+/1323310 Change-Id: Ia4daaa0926ead0f7e39ab6b3f5f13fc6d788b332
2020-06-06Merge "Merge QQ3A.200605.002 into master"android-r-beta-3android-r-beta-2Xin Li
2020-06-03Merge QQ3A.200605.002 into masterXin Li
Bug: 158095402 Merged-In: I263d2ccbf736e437ba320d6283264a18df12ef12 Change-Id: I4c784f3d31517228e6109e81119106d63affae82
2020-05-30Merge "Merge "point to new repo hooks for mainline uploads" into rvc-dev am: ↵Automerger Merge Worker
1af41a383e am: 04fb5c2376" into rvc-d1-dev-plus-aosp am: 76a30cab09 am: 471fcb044b Change-Id: I4444f6321f571f7622d401fa858a88baca2be024
2020-05-30Merge "Merge "point to new repo hooks for mainline uploads" into rvc-dev am: ↵Automerger Merge Worker
1af41a383e am: 03640d1598 am: fb526136f8" into rvc-qpr-dev-plus-aosp am: ad5665ada0 Change-Id: I0c6faa3728f823c6b585e90d231a5afbf3344c66
2020-05-30Merge "point to new repo hooks for mainline uploads" into rvc-dev am: ↵TreeHugger Robot
1af41a383e am: 03640d1598 am: 772009deac am: 84463e41e5 Change-Id: Ifd8b002609b9561ac948d46414ef1005f92b459a
2020-05-30Merge "Merge "point to new repo hooks for mainline uploads" into rvc-dev am: ↵Automerger Merge Worker
1af41a383e am: 04fb5c2376" into rvc-d1-dev-plus-aosp am: 76a30cab09 Change-Id: I3b3f3558565fd5c2f3ac02bd2f779b91c46128dc
2020-05-30Merge "Merge "point to new repo hooks for mainline uploads" into rvc-dev am: ↵Automerger Merge Worker
1af41a383e am: 03640d1598 am: fb526136f8" into rvc-qpr-dev-plus-aosp
2020-05-30Merge "point to new repo hooks for mainline uploads" into rvc-dev am: ↵TreeHugger Robot
1af41a383e am: 03640d1598 am: fb526136f8 Change-Id: I4bbd363a8a2124685c80cd9070a625b2600dde80
2020-05-30Merge "point to new repo hooks for mainline uploads" into rvc-dev am: ↵TreeHugger Robot
1af41a383e am: 03640d1598 am: 772009deac Change-Id: Ia69580cd1c9ce25a0da1ab67b2a33ddff576fd3f
2020-05-30Merge "Merge "point to new repo hooks for mainline uploads" into rvc-dev am: ↵Automerger Merge Worker
1af41a383e am: 04fb5c2376" into rvc-d1-dev-plus-aosp
2020-05-30Merge "point to new repo hooks for mainline uploads" into rvc-dev am: ↵TreeHugger Robot
1af41a383e am: 04fb5c2376 Change-Id: I050d49ed5f6e847f016c5570c6474d4de8af78dd
2020-05-30Merge "point to new repo hooks for mainline uploads" into rvc-dev am: ↵TreeHugger Robot
1af41a383e am: 03640d1598 Change-Id: I4a387ebc508a21f43ad9874ffbbecefedebde47c
2020-05-30Merge "point to new repo hooks for mainline uploads" into rvc-dev am: ↵android-11.0.0_r48android-11.0.0_r47android-11.0.0_r46android-11.0.0_r45android-11.0.0_r44android-11.0.0_r43android-11.0.0_r42android-11.0.0_r41android-11.0.0_r40android-11.0.0_r39android-11.0.0_r38android-11.0.0_r37android-11.0.0_r36android-11.0.0_r35android-11.0.0_r34android-11.0.0_r33android-11.0.0_r32android-11.0.0_r31android-11.0.0_r30android-11.0.0_r29android-11.0.0_r28android-11.0.0_r27android-11.0.0_r26android-11.0.0_r24android-11.0.0_r23android-11.0.0_r22android-11.0.0_r21android-11.0.0_r20android-11.0.0_r19android-11.0.0_r18android11-qpr3-s1-releaseandroid11-qpr3-releaseandroid11-qpr2-releaseandroid11-qpr1-s2-releaseandroid11-qpr1-s1-releaseandroid11-qpr1-releaseandroid11-qpr1-d-s1-releaseandroid11-qpr1-d-releaseandroid11-qpr1-c-releaseandroid11-d2-releaseTreeHugger Robot
1af41a383e am: 03640d1598 Change-Id: If46ff77c1c63691891e3aa77f147d0a91ec5170b
2020-05-29Merge "point to new repo hooks for mainline uploads" into rvc-dev am: 1af41a383eandroid-mainline-11.0.0_r44android-mainline-11.0.0_r43android-mainline-11.0.0_r42android-mainline-11.0.0_r41android-mainline-11.0.0_r40android-mainline-11.0.0_r39android-mainline-11.0.0_r38android-mainline-11.0.0_r37android-mainline-11.0.0_r36android-mainline-11.0.0_r35android-mainline-11.0.0_r34android-mainline-11.0.0_r32android-mainline-11.0.0_r31android-mainline-11.0.0_r30android-mainline-11.0.0_r28android-mainline-11.0.0_r27android-mainline-11.0.0_r26android-mainline-11.0.0_r25android-mainline-11.0.0_r24android-mainline-11.0.0_r23android-mainline-11.0.0_r22android-mainline-11.0.0_r21android-mainline-11.0.0_r20android-mainline-11.0.0_r18android-mainline-11.0.0_r17android-mainline-11.0.0_r16android-mainline-11.0.0_r15android-mainline-11.0.0_r14android-mainline-11.0.0_r13android-mainline-11.0.0_r12android11-mainline-tethering-releaseandroid11-mainline-permission-releaseandroid11-mainline-os-statsd-releaseandroid11-mainline-networkstack-releaseandroid11-mainline-media-swcodec-releaseandroid11-mainline-media-releaseandroid11-mainline-extservices-releaseandroid11-mainline-documentsui-releaseandroid11-mainline-conscrypt-releaseandroid11-mainline-cellbroadcast-releaseandroid11-mainline-captiveportallogin-releaseTreeHugger Robot
Change-Id: I26350c022a693ac4500f6448692ca93768dc87db
2020-05-29Merge "point to new repo hooks for mainline uploads" into rvc-dev am: 1af41a383eTreeHugger Robot
Change-Id: I4884ae34c571f1092ded5a3aaa5068e295689002
2020-05-29Merge "point to new repo hooks for mainline uploads" into rvc-dev am: 1af41a383eandroid-11.0.0_r16android11-d1-b-releaseTreeHugger Robot
Change-Id: I66643059b852341d41df3812ea0a5c964a48eec8
2020-05-29Merge "point to new repo hooks for mainline uploads" into rvc-devandroid11-devTreeHugger Robot
2020-05-29[automerger skipped] Don't collect stats if they won't be used am: ↵Jorge E. Moreira
c3ef68dc34 am: 9972369972 am: 2ff84b386e -s ours am: a4e7ebda96 -s ours am skip reason: Change-Id I8f7d9d0884311a6338bdcdec76348b8cc3ce8c69 with SHA-1 c3ef68dc34 is in history Change-Id: Idacf5a6e91e676f43f220597aa4fa1ae68cb1b6f
2020-05-29[automerger skipped] Temporarily convert to 64 bits to avoid overflows am: ↵Jorge E. Moreira
1911e63d5f am: 3dd7f0f889 am: 47a8964dcd -s ours am: 4dbf3d81ac -s ours am skip reason: Change-Id If7ebbda38b2450a59ed3c99ffbb59dc62431a324 with SHA-1 1911e63d5f is in history Change-Id: Iac384121b49438d60fcf621bb985fcc394daa556
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-21 19:40:00 +0000