author Randell Jesup <>
Wed, 18 Nov 2015 15:03:25 -0500
changeset 307280 ae32ad44ce1c048258a881dbaa7727def08c53a4
parent 168645 bd8f1571937ffe786828b17c3a6963323d046157
permissions -rw-r--r--
Bug 1198458: Rollup of changes previously applied to media/webrtc/trunk/webrtc and fixes to those rs=jesup r=froyd,jib,bwc,jesup,gcp,sotaro,pkerr,pehrsons Landing as one rolled-up patch to avoid breaking regression tests, and in keeping with previous WebRTC imports. Broken out parts that needed review are on the bug.

/* This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this file,
 * You can obtain one at */

#include "../android/"