Bug 1050501 - add timeline marker from EventListenerManager. r=smaug r=paul
Bug 1068144 - Expose allocation time stamps in the memory actor. r=jryans
Bug 1088712 - Update toolbar images with glowing download icon. r=gijs
Bug 1089591 - Customize mode should be customizable after reset. r=Gijs r=mconley
bug 1090650 -  Change chromecast app id to point to official chromecast app r=mfinkle
Merge mozilla-central to fx-team
Backed out changeset e6c622c61207 (bug 1089591) bc1 e10s test failure
Bug 1089547: simplify LoopRooms implementation, add support for events. r=Standard8
Bug 1084228 Replace 'callId' with 'windowId' in a Loop conversation window so that it represents what it is and is distinct from the real 'callId'. r=mikedeboer
Bug 1089547: fix error passing in MozLoopAPI and remove leftover in LoopRooms. r=Standard8
Bug 1089913 - Consult Fennec session store for zombie tabs. r=ochameau
Bug 1081343 followup: skip the tests for non-Nightly builds, and ifdef more of nsBrowserGlue.js/firefox.js

--HG--
extra : rebase_source : c2d3000538246ad6c892cd8cf7934ab55583a9d3
Bug 1031033: Expose tracking protection pref in privacy pref pane, r=adw

--HG--
extra : rebase_source : cbb2b6f1e5a4288d9718858d5c58bf166b44b778
Bug 1072069 - Part 1: Read CPHS Mailbox Numbers (0x6F17) when MBDN is invalid. r=echen
Bug 1072069 - Part 2: Test cases to verify CPHS_INFO and CPHS_MBN and the recovery of CPHS_MBN when failure from readMBDN. r=echen
Bug 1082001 - Cleanup settings lock from parent itself. r=bent

From bug 1065128 SettingsManager has been changed to listen the
dom-window-destroyed event for its cleanup. However, when running Gaia
in Mulet, a race condition is exposed. For B2G, when loading a page,
about:blank is first used. This means that window destroyed events will
be triggered. However, from the dom-window-destroyed event we cannot
distinguish whether this is about:blank or a legit application being
closed. SettingsManager gets initialized (i.e., init() called) when the
application makes use of navigator.mozSettings. So the chain of event is
that we have a SettingsManager living because System app did some
request. At this time, about:blank is being unloaded and triggers a
dom-window-destroyed event. This makes SettingsManager doing its
cleanup, especially freeing the window reference. Then in the meantime,
we have the navigator.mozSettings use that is progressing. At some
point, SettingsManager has no more window to send messages to, and Gaia
is not able to even start.

SettingsRequestManager lives on the parent process and SettingsManager
lives on the child side. Part of the cleanup performed by
SettingsManager was to ensure pending locks on the parent process would
be forced to finalize to make sure those are being properly committed.
We move this cleanup to SettingsRequestManager and we augment the lock
informations with the proper inner window id. This way we can track
which lock is attached to which inner window when the lock gets created.
And thus we can listen on inner-window-destroyed from
SettingsRequestManager to be able to force finalize on any pending lock.
Impacted code path are those were we are not running out of process.
When we are running out of process, SettingsRequestManager already
listens on the child-process-shutdown event to perform the lock
finalization.
Bug 1083449 - Use a shared mutex instead of a per-instance mutex to protect ifc commands. r=vchang, r=chucklee
Bug 1087152 - Ignore the failure cause by ifc_remove_route "0.0.0.0" or "::". r=vchang
Bug 1086958: re-add default browser strings from bug 951627

--HG--
extra : rebase_source : 082afdd90f2620c596523e4d0b16aab3a5d8296e
Backed out changeset 46d81f906852 (bug 1085759) for b2g device problems on request by QA