Bug 1074686 - Part 3 Revamped view architecture for Desktop Loop rooms. r=Standard8
Bug 1074686 - Part 4 Improve Loop conversation store registration to only register for actions when they need it, and change PeerHungupCall into RemotePeerDisconnected to fit better with what it is for. r=nperriault
Bug 1096013 - [e10s] Improve perceived session restore duration by prioritizing selected tabs when restoring session history and by setting tab labels and icons as soon as possible to indicate a restored session r=smacleod
Define MOZ_DEV_EDITION in aurora branding configuration (bug 1095934). r=glandium

--HG--
extra : rebase_source : 28256984e52a182614d36bf0d47122bea6d44c93
Merge mozilla-central to fx-team
Bug 1069421 - Add a memory graph to the timeline, r=pbrosset,paul

--HG--
rename : browser/devtools/shared/test/browser_graphs-09.js => browser/devtools/shared/test/browser_graphs-09a.js
rename : browser/devtools/timeline/widgets/overview.js => browser/devtools/timeline/widgets/markers-overview.js
Bug 1095443 - Ensure processNextEvent never blocks after processing a Promise microtask. r=bz
Bug 1076767 - Add a spinner to the Import Contacts button whilst importing. r=jaws
Backed out changeset 942aec7a1572 for mochitest-dt failures, r=me

--HG--
rename : browser/devtools/shared/test/browser_graphs-09a.js => browser/devtools/shared/test/browser_graphs-09.js
rename : browser/devtools/timeline/widgets/markers-overview.js => browser/devtools/timeline/widgets/overview.js
Bug 1074686 - Part 5 Hook up the active room store to the sdk for Loop rooms on desktop to enable audio and video in rooms. r=nperriault
Bug 1078539 - Part 2: Delay showing a doorhanger to prevent flickering in windows, and call success immediately to prevent duplicates. r=jryans
Bug 864250 - Create a browser chrome test that checks the zoom level property of the object. r=yury
Bug 1036514 - Stumbler logging by setting setprop log.tag.<x> DEBUG. r=nalexander

Setting adb shell setprop log.tag.PassiveStumbler DEBUG will turn on additional
debug logging for stumbler. The Log.d messages are wrapped in conditionals for the current log level (which is a cached value).
Bug 1076857 - Add basic telemetry to Storage Inspector. r=mratcliffe
Bug 1093883 - Disable app install for runtimes that don't allow it. r=jryans
Bug 1096517 - Disable stumbler test on 2.3. r=gbrown
Bug 1094968 - Skip tilt visibility for remote toolboxes. r=mratcliffe

--HG--
extra : transplant_source : %B9%D8%87%94%5B%AF%A1%E7%96%94B%28%E9%85w%3E%14I%F9%FF
Bug 1095506 - Serialize the error object when saving to the store. r=paolo

We now serialize the Download.error property when saving to the store so
that data about error conditions will survive a restart. This is
important for supporting blocked downloads with partial data that could
be unblocked.

--HG--
extra : rebase_source : 40821e59e2b258803cde5da456cd9d0d20caa9e0
Bug 1095506 - Clean up and rename kSerializableDownloadProperties. r=paolo

--HG--
extra : rebase_source : 4ac9627e2d8d108e416e50b8746825714ff4e52e
Backed out changesets 7bfa96b421ea and da9faa259da1 (bug 1095506) for mochitest-bc failures.