Backed out changeset e016c34c4d52 (bug 1022472) for robocop failures.
Backed out changeset 5747034f2bcc (bug 899347) for mochitest-bc failures.
CLOSED TREE
Bug 1064657 - Add testSelectionHandler test to ensure readOnly input elements can't be cut, r=wesj
Bug 1017257 - Make loop code CSP-friendly (remove all inline script) r=Standard8
Bug 1063696 - fix datareporting timeout orange by not closing the prefs tab prematurely. r=gfritzsche
Bug 1064137 - fix datareporting service so it doesn't initialize a test's policy object. r=gfritzsche
Merge m-c to fx-team a=merge
Bug 1062904 - crash in java.lang.NullPointerException: uriString at android.net.Uri.<init>(Uri.java) r=mfinkle
Bug 1064848 - Activate timeline test browser_timelineMarkers-02.js for e10s r=pbrosset
Bug 1064282 - Scratchpad should have statusbar like Page Source viewer. r=fitzgen

---
 browser/devtools/scratchpad/scratchpad.js          |   12 ++++++++++++
 browser/devtools/scratchpad/scratchpad.xul         |    1 +
 .../test/browser_scratchpad_run_error_goto_line.js |   11 +++++++++++
 .../chrome/browser/devtools/scratchpad.properties  |    5 +++++
 4 files changed, 29 insertions(+), 0 deletions(-)
Bug 1058405 - Fix typo in function name. r=jryans
Bug 1045647 - register webide components in package-manifest.in. r=jryans
Bug 949754 - Tracer actors should use source maps r=fitzgen
Bug 1064880 - Keep track of the current search engine in MainActivity. r=nalexander
Merge fx-team to m-c with bustage fix, a=merge
No bug - Revert browser-plugins.js to revision 687318d464a5. a=me
Bug 1067748. When a solid-color display item covers everything else in its layer, make it a ColorLayer. r=tn

--HG--
extra : rebase_source : e0fdaddfd24c59531ffef865b46f948ba203acaa
Bug 1051636. Don't mark video ImageLayers as opaque. r=tn
The visible region of the layer is not necessarily restricted to the image
that is will be rendered.

Also, we don't know for sure an opaque video frame is going to appear.

--HG--
extra : rebase_source : c6e0f1f0a49b5722b917718634439f045e8a535d