Merge branch 'upstream-master'

Bug: 153469641
Test: none
Change-Id: Ic33e363deb0d1ac4bb4d57c3c239eb2e45370802
This commit is contained in:
Jorge E. Moreira
2020-07-17 14:12:45 -07:00
9929 changed files with 1031155 additions and 779502 deletions

View File

@ -0,0 +1,3 @@
per-file Camera*=sakal@webrtc.org
per-file Histogram.java=sakal@webrtc.org
per-file Metrics.java=sakal@webrtc.org