summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 69f66f662e -s ↵android-mainline-12.0.0_r99android-mainline-12.0.0_r98android-mainline-12.0.0_r97android-mainline-12.0.0_r96android-mainline-12.0.0_r95android-mainline-12.0.0_r94android-mainline-12.0.0_r93android-mainline-12.0.0_r92android-mainline-12.0.0_r91android-mainline-12.0.0_r90android-mainline-12.0.0_r9android-mainline-12.0.0_r89android-mainline-12.0.0_r88android-mainline-12.0.0_r87android-mainline-12.0.0_r86android-mainline-12.0.0_r85android-mainline-12.0.0_r84android-mainline-12.0.0_r83android-mainline-12.0.0_r82android-mainline-12.0.0_r81android-mainline-12.0.0_r80android-mainline-12.0.0_r8android-mainline-12.0.0_r79android-mainline-12.0.0_r78android-mainline-12.0.0_r77android-mainline-12.0.0_r76android-mainline-12.0.0_r75android-mainline-12.0.0_r74android-mainline-12.0.0_r73android-mainline-12.0.0_r72android-mainline-12.0.0_r71android-mainline-12.0.0_r70android-mainline-12.0.0_r7android-mainline-12.0.0_r69android-mainline-12.0.0_r68android-mainline-12.0.0_r67android-mainline-12.0.0_r66android-mainline-12.0.0_r65android-mainline-12.0.0_r64android-mainline-12.0.0_r63android-mainline-12.0.0_r62android-mainline-12.0.0_r61android-mainline-12.0.0_r60android-mainline-12.0.0_r6android-mainline-12.0.0_r59android-mainline-12.0.0_r58android-mainline-12.0.0_r57android-mainline-12.0.0_r56android-mainline-12.0.0_r53android-mainline-12.0.0_r52android-mainline-12.0.0_r51android-mainline-12.0.0_r50android-mainline-12.0.0_r5android-mainline-12.0.0_r49android-mainline-12.0.0_r48android-mainline-12.0.0_r47android-mainline-12.0.0_r46android-mainline-12.0.0_r45android-mainline-12.0.0_r44android-mainline-12.0.0_r43android-mainline-12.0.0_r42android-mainline-12.0.0_r41android-mainline-12.0.0_r40android-mainline-12.0.0_r39android-mainline-12.0.0_r38android-mainline-12.0.0_r37android-mainline-12.0.0_r35android-mainline-12.0.0_r34android-mainline-12.0.0_r33android-mainline-12.0.0_r32android-mainline-12.0.0_r31android-mainline-12.0.0_r30android-mainline-12.0.0_r3android-mainline-12.0.0_r29android-mainline-12.0.0_r28android-mainline-12.0.0_r27android-mainline-12.0.0_r26android-mainline-12.0.0_r25android-mainline-12.0.0_r24android-mainline-12.0.0_r23android-mainline-12.0.0_r22android-mainline-12.0.0_r21android-mainline-12.0.0_r20android-mainline-12.0.0_r2android-mainline-12.0.0_r19android-mainline-12.0.0_r18android-mainline-12.0.0_r17android-mainline-12.0.0_r16android-mainline-12.0.0_r15android-mainline-12.0.0_r14android-mainline-12.0.0_r13android-mainline-12.0.0_r126android-mainline-12.0.0_r125android-mainline-12.0.0_r124android-mainline-12.0.0_r123android-mainline-12.0.0_r122android-mainline-12.0.0_r121android-mainline-12.0.0_r120android-mainline-12.0.0_r12android-mainline-12.0.0_r119android-mainline-12.0.0_r118android-mainline-12.0.0_r117android-mainline-12.0.0_r116android-mainline-12.0.0_r115android-mainline-12.0.0_r114android-mainline-12.0.0_r113android-mainline-12.0.0_r110android-mainline-12.0.0_r11android-mainline-12.0.0_r109android-mainline-12.0.0_r108android-mainline-12.0.0_r107android-mainline-12.0.0_r106android-mainline-12.0.0_r105android-mainline-12.0.0_r104android-mainline-12.0.0_r103android-mainline-12.0.0_r102android-mainline-12.0.0_r101android-mainline-12.0.0_r100android-mainline-12.0.0_r10android-mainline-12.0.0_r1aml_wif_311811030aml_tz3_311312010aml_tet_311811050aml_sdk_311710000aml_pco_311011000aml_mpr_311911090aml_doc_310851020android12-mainline-wifi-releaseandroid12-mainline-tethering-releaseandroid12-mainline-statsd-releaseandroid12-mainline-sdkext-releaseandroid12-mainline-resolv-releaseandroid12-mainline-permission-releaseandroid12-mainline-neuralnetworks-releaseandroid12-mainline-networkstack-releaseandroid12-mainline-mediaprovider-releaseandroid12-mainline-media-swcodec-releaseandroid12-mainline-media-releaseandroid12-mainline-ipsec-releaseandroid12-mainline-extservices-releaseandroid12-mainline-documentsui-releaseandroid12-mainline-conscrypt-releaseandroid12-mainline-cellbroadcast-releaseandroid12-mainline-captiveportallogin-releaseandroid12-mainline-art-releaseandroid12-mainline-adbd-releaseXin Li
ours am: 704e28140c -s ours am: 0bd1dfab88 -s ours am skip reason: Change-Id I71d7859864524a65cc928f4555dd4dc5cd7a9925 with SHA-1 1cf29eb4cf is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I7d7968a81ecd530ef6e8efdd0775098ed8799913
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 69f66f662e -s ↵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-1Xin Li
ours am: 704e28140c -s ours am skip reason: Change-Id I71d7859864524a65cc928f4555dd4dc5cd7a9925 with SHA-1 1cf29eb4cf is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I4e241f094d35ca121a1b34cf05e27349c796b36d
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 69f66f662e -s oursXin Li
am skip reason: Change-Id I71d7859864524a65cc928f4555dd4dc5cd7a9925 with SHA-1 1cf29eb4cf is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I15f4b932c4ac8b77a5ffb488baaf62a5de0f616c
2021-02-20Mark ab/7061308 as merged in stage.android-s-beta-5android-s-beta-4android-s-beta-3android-s-beta-2android-s-beta-1android-s-beta-5android-s-beta-4Xin Li
Bug: 180401296 Merged-In: I71d7859864524a65cc928f4555dd4dc5cd7a9925 Change-Id: Ic391159e8dd8883710b1ff45cb073a00bacf0c74
2021-02-17[LSC] Add LOCAL_LICENSE_KINDS to external/libwebm am: a26f3396c1 am: ↵Bob Badour
db06ddaca6 am: 1e39c29b88 am: e0cd8697cf Original change: https://android-review.googlesource.com/c/platform/external/libwebm/+/1588663 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I296b0e8c0b4663b9acc9b256be93fe87d8d931e9
2021-02-17[LSC] Add LOCAL_LICENSE_KINDS to external/libwebm am: a26f3396c1 am: ↵Bob Badour
db06ddaca6 am: 1e39c29b88 Original change: https://android-review.googlesource.com/c/platform/external/libwebm/+/1588663 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ib4ebe02ddfe6a60a9237f29797ad7a0519e0ada1
2021-02-17[LSC] Add LOCAL_LICENSE_KINDS to external/libwebm am: a26f3396c1 am: db06ddaca6Bob Badour
Original change: https://android-review.googlesource.com/c/platform/external/libwebm/+/1588663 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Idba69c66955aae4c6a8ba9380bc43b972862f08e
2021-02-17[LSC] Add LOCAL_LICENSE_KINDS to external/libwebm am: a26f3396c1Bob Badour
Original change: https://android-review.googlesource.com/c/platform/external/libwebm/+/1588663 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I5ce4bb83b89f2901fee5652c6ea0897dadd14ba2
2021-02-12[LSC] Add LOCAL_LICENSE_KINDS to external/libwebmandroid-s-preview-1Bob 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: I9016057dcb811ceea4b0cbb71a6febd16646be64
2020-12-15Merge "Revert "ANDROID: Add simple fuzzing targets for video and video+audio ↵Diego Vela
encoding."" am: 2a2e619c0e am: 7d6341ae53 am: 1cf29eb4cf Original change: https://android-review.googlesource.com/c/platform/external/libwebm/+/1528747 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I14c087a08d2b4697937ffa9b952ac85bd73e8e37
2020-12-15Merge "Revert "ANDROID: Add simple fuzzing targets for video and video+audio ↵Diego Vela
encoding."" am: 2a2e619c0e am: 7d6341ae53 Original change: https://android-review.googlesource.com/c/platform/external/libwebm/+/1528747 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I71d7859864524a65cc928f4555dd4dc5cd7a9925
2020-12-15Merge "Revert "ANDROID: Add simple fuzzing targets for video and video+audio ↵Diego Vela
encoding."" am: 2a2e619c0e Original change: https://android-review.googlesource.com/c/platform/external/libwebm/+/1528747 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I73cd5dd6b4c64cebc3462756d5f5791ac63a54de
2020-12-14Merge "Revert "ANDROID: Add simple fuzzing targets for video and video+audio ↵platform-tools-31.0.0Diego Vela
encoding.""
2020-12-14Revert "ANDROID: Add simple fuzzing targets for video and video+audio encoding."Diego Vela
This reverts commit f2b9cbe96de02a2150cc3a1a24d2c1f3c95f6091. Reason for revert: Build breakage. Bug: 175637287 Change-Id: Iee3769f81fb3e21c16f685ad2f6cbb0ee4465b2f
2020-12-12Merge "ANDROID: Add simple fuzzing targets for video and video+audio ↵Treehugger Robot
encoding." am: 5fdfb920c6 am: 47d91ab99b am: 8fb71d456f Original change: https://android-review.googlesource.com/c/platform/external/libwebm/+/1506861 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ib47a0cda6aca7c485571d3ae3a24e0a8a3ec5ec5
2020-12-12Merge "ANDROID: Add simple fuzzing targets for video and video+audio ↵Treehugger Robot
encoding." am: 5fdfb920c6 am: 47d91ab99b Original change: https://android-review.googlesource.com/c/platform/external/libwebm/+/1506861 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Id95a7ffe334a7fb8231e87e150388bb63e3d2c76
2020-12-12Merge "ANDROID: Add simple fuzzing targets for video and video+audio ↵Treehugger Robot
encoding." am: 5fdfb920c6 Original change: https://android-review.googlesource.com/c/platform/external/libwebm/+/1506861 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I9cbef0ed8bfd9332c3ab2bbba7675a6cd53500bf
2020-12-12Merge "ANDROID: Add simple fuzzing targets for video and video+audio encoding."Treehugger Robot
2020-12-02Merge "Upgrade libwebm to 485fb67b324aec5298765e899dc054459d3946e5" am: ↵Treehugger Robot
0428151ec8 am: 1a5a14f484 am: c52e98a9c1 Original change: https://android-review.googlesource.com/c/platform/external/libwebm/+/1510523 Change-Id: I3b514d920f315234a6ca0b8f4b3a5009dd0b9b51
2020-12-02Merge "Upgrade libwebm to 485fb67b324aec5298765e899dc054459d3946e5" am: ↵Treehugger Robot
0428151ec8 am: 1a5a14f484 Original change: https://android-review.googlesource.com/c/platform/external/libwebm/+/1510523 Change-Id: I0eea8902b3e0126ebd8c817d2a924f637442c0bf
2020-12-02Merge "Upgrade libwebm to 485fb67b324aec5298765e899dc054459d3946e5" am: ↵Treehugger Robot
0428151ec8 Original change: https://android-review.googlesource.com/c/platform/external/libwebm/+/1510523 Change-Id: I9dc4946c9db10c5b5e7ea68df77259d60a443607
2020-12-01Merge "Upgrade libwebm to 485fb67b324aec5298765e899dc054459d3946e5"Treehugger Robot
2020-11-26ANDROID: Add Android.bp for libwebm_mkvmuxer am: 872259d451 am: 736811399b ↵A. Cody Schuffelen
am: 28091ebfbf Original change: https://android-review.googlesource.com/c/platform/external/libwebm/+/1506860 Change-Id: I6861c7f796d31a8bf7414d96eb97bef41581a441
2020-11-26mkvmuxer: Keep Segment in a good state when frame writes fail am: 6157fd6b7d ↵A. Cody Schuffelen
am: cfbe5d810d am: 31b542f9cd Original change: https://android-review.googlesource.com/c/platform/external/libwebm/+/1510509 Change-Id: I6dcbc3d870db53ec42d7be04e3fb7c57bb96a6f5
2020-11-26ANDROID: Add Android.bp for libwebm_mkvmuxer am: 872259d451 am: 736811399bA. Cody Schuffelen
Original change: https://android-review.googlesource.com/c/platform/external/libwebm/+/1506860 Change-Id: I7159b359e5adbed691949513b66b91137764c0d8
2020-11-26mkvmuxer: Keep Segment in a good state when frame writes fail am: 6157fd6b7d ↵A. Cody Schuffelen
am: cfbe5d810d Original change: https://android-review.googlesource.com/c/platform/external/libwebm/+/1510509 Change-Id: I5df4f5d63c0620993da75f6555531be8722a0d97
2020-11-26ANDROID: Add Android.bp for libwebm_mkvmuxer am: 872259d451A. Cody Schuffelen
Original change: https://android-review.googlesource.com/c/platform/external/libwebm/+/1506860 Change-Id: Ia2d568e1a47bb5f74a3f439ac23c80e5f2b9c1f8
2020-11-26mkvmuxer: Keep Segment in a good state when frame writes fail am: 6157fd6b7dA. Cody Schuffelen
Original change: https://android-review.googlesource.com/c/platform/external/libwebm/+/1510509 Change-Id: I61a08529eba369b6248d86c9d3512e2856559599
2020-11-25ANDROID: Add simple fuzzing targets for video and video+audio encoding.A. Cody Schuffelen
Test: ${ANDROID_HOST_OUT}/fuzz/$(get_build_var HOST_ARCH)/libwebm_mkvmuxer_fuzzer_one_video_audio_track/libwebm_mkvmuxer_fuzzer_one_video_audio_track Test: ${ANDROID_HOST_OUT}/fuzz/$(get_build_var HOST_ARCH)/libwebm_mkvmuxer_fuzzer_one_video_track/libwebm_mkvmuxer_fuzzer_one_video_track Change-Id: I62b828e4c83d144f9551262207775913962efac6
2020-11-24Upgrade libwebm to 485fb67b324aec5298765e899dc054459d3946e5Haibo Huang
Test: make Change-Id: Ic4316c2f1a550a3f24326e5efe725e4597b7d3e3
2020-11-24Merge "mkvmuxer: Keep Segment in a good state when frame writes fail"James Zern
2020-11-24ANDROID: Add Android.bp for libwebm_mkvmuxerA. Cody Schuffelen
Test: m -j libwebm_mkvmuxer Change-Id: I4b48ebcd97c9b0f89a0f48d213465db93476020e
2020-11-24mkvmuxer: Keep Segment in a good state when frame writes failA. Cody Schuffelen
The problem in WriteFramesAll manifests as a null pointer dereference, while the problem in WriteFramesLessThan manifests as a use-after-free. When multiple audio frames are queued in the Segment and a call to WriteFramesAll or WriteFramesLessThan fails partway through, there may be null frames left in the Segment frame queue. This is fixed by dropping the invalid frames and continuing so that the queue is in a good state after a call, even if it fails. Found through fuzzing mkvmuxer. Minimal reproduction case for issue with WriteFramesAll. ``` #include <stdint.h> #include "mkvmuxer/mkvmuxer.h" #include "mkvmuxer/mkvwriter.h" int main() { mkvmuxer::MkvWriter writer; writer.Open("file.mkv"); mkvmuxer::Segment segment; segment.Init(&writer); uint64_t video_track = segment.AddVideoTrack(1, 1, 0); uint64_t audio_track = segment.AddAudioTrack(1, 1, 0); uint8_t data[] = {0}; segment.AddFrame(data, 1, audio_track, 395136991333ULL, false); segment.AddFrame(data, 1, audio_track, 18374686479674129407ULL, false); segment.AddFrame(data, 1, video_track, 18446462628926195463ULL, false); segment.Finalize(); } ``` The second audio frame has an invalid timestamp that is only caught in WriteFrame from mkvmuxerutil.cc , causing WriteFramesAll to fail on writing the second audio frame when the first video frame forces a new cluster. WriteFramesLessThan has a similar pattern, where failing partway through a write can leave the Segment in a bad state. Bug: b/174070314 Test: clang++ *.cc repro.cpp -I.. -o repro -fsanitize=address -g && ./repro Change-Id: I05c707477e454752776c7571aff9f24f22195d55 (cherry picked from commit 97f8074dc9cc5ca0263325c16340ff0f4fcfc212)
2020-11-23mkvmuxer,Cluster::Size: make uint64 conversion explicitJames Zern
PiperOrigin-RevId: 314246132 Change-Id: I92a5a7e46cfde7c7691f90856bd962b606529036
2020-11-23mkvmuxer: Keep Segment in a good state when frame writes failA. Cody Schuffelen
The problem in WriteFramesAll manifests as a null pointer dereference, while the problem in WriteFramesLessThan manifests as a use-after-free. When multiple audio frames are queued in the Segment and a call to WriteFramesAll or WriteFramesLessThan fails partway through, there may be null frames left in the Segment frame queue. This is fixed by dropping the invalid frames and continuing so that the queue is in a good state after a call, even if it fails. Found through fuzzing mkvmuxer. Minimal reproduction case for issue with WriteFramesAll. ``` #include <stdint.h> #include "mkvmuxer/mkvmuxer.h" #include "mkvmuxer/mkvwriter.h" int main() { mkvmuxer::MkvWriter writer; writer.Open("file.mkv"); mkvmuxer::Segment segment; segment.Init(&writer); uint64_t video_track = segment.AddVideoTrack(1, 1, 0); uint64_t audio_track = segment.AddAudioTrack(1, 1, 0); uint8_t data[] = {0}; segment.AddFrame(data, 1, audio_track, 395136991333ULL, false); segment.AddFrame(data, 1, audio_track, 18374686479674129407ULL, false); segment.AddFrame(data, 1, video_track, 18446462628926195463ULL, false); segment.Finalize(); } ``` The second audio frame has an invalid timestamp that is only caught in WriteFrame from mkvmuxerutil.cc , causing WriteFramesAll to fail on writing the second audio frame when the first video frame forces a new cluster. WriteFramesLessThan has a similar pattern, where failing partway through a write can leave the Segment in a bad state. Bug: b/174070314 Test: clang++ *.cc repro.cpp -I.. -o repro -fsanitize=address -g && ./repro Change-Id: I05c707477e454752776c7571aff9f24f22195d55
2020-11-20ANDROID: Add metadata files. am: dcaf20a12f am: 537e880941 am: 6f9d363c13 ↵A. Cody Schuffelen
am: e1c992cbab Original change: https://android-review.googlesource.com/c/platform/external/libwebm/+/1504156 Change-Id: I933cf5b00fe54a27c0642cb6886b266e1231293b
2020-11-20ANDROID: Delete Android.mk to avoid conflicts with other imports. am: ↵A. Cody Schuffelen
c5427947e7 am: ff579d2ec5 am: 95839a5b03 am: 721d6506da Original change: https://android-review.googlesource.com/c/platform/external/libwebm/+/1504155 Change-Id: Ia7e4b310db6e99bed427cbd810a18991096bc4c3
2020-11-20Merge remote-tracking branch 'origin/upstream-master' am: 2efb1cd57a am: ↵A. Cody Schuffelen
739708406b am: 4534b4c172 am: 1643f90bc7 Original change: https://android-review.googlesource.com/c/platform/external/libwebm/+/1504154 Change-Id: I6bd462ce47586a293e3460acab209e18a1279372
2020-11-20ANDROID: Add metadata files. am: dcaf20a12f am: 537e880941 am: 6f9d363c13A. Cody Schuffelen
Original change: https://android-review.googlesource.com/c/platform/external/libwebm/+/1504156 Change-Id: Idab0755bf5701e173c08f11506998bd1f0146447
2020-11-20ANDROID: Delete Android.mk to avoid conflicts with other imports. am: ↵A. Cody Schuffelen
c5427947e7 am: ff579d2ec5 am: 95839a5b03 Original change: https://android-review.googlesource.com/c/platform/external/libwebm/+/1504155 Change-Id: I4741fc2f95eec460ea626cf04bb28cb19ef5645b
2020-11-20Merge remote-tracking branch 'origin/upstream-master' am: 2efb1cd57a am: ↵A. Cody Schuffelen
739708406b am: 4534b4c172 Original change: https://android-review.googlesource.com/c/platform/external/libwebm/+/1504154 Change-Id: Ia979de631ba44ceb2731eb967ade740b552fa95e
2020-11-20ANDROID: Add metadata files. am: dcaf20a12f am: 537e880941A. Cody Schuffelen
Original change: https://android-review.googlesource.com/c/platform/external/libwebm/+/1504156 Change-Id: I6324cd512a88c624857df9c9aacffbe06b7db4e0
2020-11-20ANDROID: Delete Android.mk to avoid conflicts with other imports. am: ↵A. Cody Schuffelen
c5427947e7 am: ff579d2ec5 Original change: https://android-review.googlesource.com/c/platform/external/libwebm/+/1504155 Change-Id: Ic6e170be795ca45f8887d50856d17973aae206a6
2020-11-20Merge remote-tracking branch 'origin/upstream-master' am: 2efb1cd57a am: ↵A. Cody Schuffelen
739708406b Original change: https://android-review.googlesource.com/c/platform/external/libwebm/+/1504154 Change-Id: I613fd1293bc638f7553b76ca4dc721267fc66f41
2020-11-20ANDROID: Add metadata files. am: dcaf20a12fA. Cody Schuffelen
Original change: https://android-review.googlesource.com/c/platform/external/libwebm/+/1504156 Change-Id: I9aec621ced3c445df40354414fc9cc0d7e159b29
2020-11-20ANDROID: Delete Android.mk to avoid conflicts with other imports. am: c5427947e7A. Cody Schuffelen
Original change: https://android-review.googlesource.com/c/platform/external/libwebm/+/1504155 Change-Id: Ia7fb6a6daf0bf0eb3e783a084ba8aade082331a5
2020-11-20Merge remote-tracking branch 'origin/upstream-master' am: 2efb1cd57aA. Cody Schuffelen
Original change: https://android-review.googlesource.com/c/platform/external/libwebm/+/1504154 Change-Id: I1edc0db1e552c633cc882dd16570be02ef2b90c3
2020-11-18ANDROID: Add metadata files.A. Cody Schuffelen
Change-Id: I73d42954deb308744f30b7b111ccbe6a97ae07f5
2020-11-18ANDROID: Delete Android.mk to avoid conflicts with other imports.A. Cody Schuffelen
Change-Id: I49f00c749b55affd55744592b1bcea3c293ba057
2020-11-18Merge remote-tracking branch 'origin/upstream-master'A. Cody Schuffelen
Change-Id: I64f60cd11ef4e12860c42acc80fd444e6d4dd9e3
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-03 00:02:59 +0000