Merge mozilla-central to fx-team on a CLOSED TREE

This commit is contained in:
Carsten "Tomcat" Book 2016-03-11 17:13:58 +01:00
commit 69a792a3fe

View File

@ -1,7 +1,6 @@
[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 =