Bug 884182 - Prevent incorrect state transition. r=doublec, a=leo+
Bug 794687 - Add --timeout argument to Marionette, r=mdas, a=test-only
Bug 823222 - We should check the host/port before running tests, r=mdas, a=test-only
Bug 883281 - Add ability to skip tests based on device, r=davehunt, a=test-only
Bug 873591 - Make better errors for execute_script failures, r=mdas, a=test-only
Bug 883814. Make HasLowUndecodedData not use GetBuffered, but instead estimate based on the current playback data rate. r=cpearce,a=leo+

--HG--
extra : rebase_source : 6056a78baffd9d4897656fc9d95cc8d0169d6792
Bug 883814. Part 2: Allow buffering to be triggered when we're low on decoded video but not audio. r=cpearce,a=leo+

--HG--
extra : rebase_source : 759e8cffc0fe85069430d01c192dd6b7b4495c4c
Bug 887646 - B2G MMS: Do not set content-length in smil header when sending. r=gene a=leo+
Bug 885979 - Add support for enabling Contacts API debugging output at runtime. r=gwagner a=leo+

--HG--
extra : rebase_source : 514806233527b3a3f83acdd2bfcfe54ad86025a2
Bug 885979 - Backout. a=bustage.
Bug 883024 - Install missing stylesheets for b2g. r=roc a=leo+
Bug 887093 - [MMS] view attach image in text field will crash. r=khuey, a=leo+
Backed out changeset bca4c537aaa3 (bug 885979)

--HG--
extra : rebase_source : e8866fa457ce0f89fe77928e829c9e6b00ee530b
Backout Bug 887093. a=bustage
No bug - Fix broken header guard in resource_manager.h. r=jesup a=trivial

--HG--
extra : rebase_source : 546d7b28d16d8e670b7607aa5400055b7afa03ee
Bug 884022 - fix clang warnings about pointer-to-int comparisons in test_AsXXX_helpers.cpp; r=dholbert a=test-only

--HG--
extra : rebase_source : 863336f468061818184992daab75007b78ffb840
Bug 885979 - Add support for enabling Contacts API debugging output at runtime. r=gwagner a=leo+

--HG--
extra : rebase_source : c89acad2805ce571d55a8390f8c1791620612364
Backed out changeset d923b362bf50 (bug 885979)
Bug 887815 - [SMS][MMS] receiving successful delivery report even though delivery report is OFF in settings. r=ctai a=leo+
Bug 887326. Back out fix for bug 876542. a=leo+