Commit Graph

3 Commits

Author SHA1 Message Date
85770cd25b Merge branch 'upstream-master'
Bug: 153469641
Test: none
Change-Id: Ic33e363deb0d1ac4bb4d57c3c239eb2e45370802
2020-07-17 14:25:15 -07:00
7435232cb4 Add license type: BSD+Apache3+MIT+Boost = NOTICE
Bug: 68860345
Bug: 69058154
Bug: 151953481

Test: no code changes
Change-Id: I45d78acb11906621b4e91403c5e2c10dcd361fe6
2020-04-23 16:40:11 -07:00
a04cfef17d Add METADATA for webrtc
Test: NA
Exempt-From-Owner-Approval: conflict with upstream OWNERS file
Change-Id: I28f133b0dfd684a8e83ce83c3f58ceda10f55f26
2018-07-10 15:11:57 -07:00