Merge mozilla-central to mozilla-inbound on a CLOSED TREE
authorCarsten "Tomcat" Book <cbook@mozilla.com>
Fri, 11 Mar 2016 17:14:35 +0100
changeset 339551 c8b421423059068586d436fb7fbab9be5059faf5
parent 339550 28bca8e29596cfa1c24b864925cb5cb5e20e35ab (current diff)
parent 339537 946ed22cad04431c75ab5093989dfedf1bae5a3e (diff)
child 339552 d80794ec133731287eeadff04797d4cd93641509
push id12762
push userbmo:rail@mozilla.com
push dateFri, 11 Mar 2016 19:47:45 +0000
milestone48.0a1
Merge mozilla-central to mozilla-inbound on a CLOSED TREE
--- a/dom/media/tests/mochitest/mochitest.ini
+++ b/dom/media/tests/mochitest/mochitest.ini
@@ -1,12 +1,11 @@
 [DEFAULT]
 # Android 2.3 - bug 981881
 tags = msg webrtc
-<<<<<<< local
 subsuite = media
 skip-if = android_version == '10' || (buildapp == 'mulet') || (toolkit == 'gonk' && debug) # b2g(Either bug 1171118 or bug 1169838, take your pick)
 support-files =
   head.js
   dataChannel.js
   mediaStreamPlayback.js
   network.js
   nonTrickleIce.js