Bug 937132 - SpiderMonkey: Check for overflows in LifoAlloc. r=luke, a=koi+
Bug 884226 - Add 'willReadFrequently' getContext() option for 2D canvas. r=ehsan, r=gwright, a=koi+
Bumping gaia.json for 1 gaia-1_2 revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-1_2/rev/66ed88ef78b6
Author: Etienne Segonzac <etienne@segonzac.info>
Desc: Merge pull request #14892 from etiennesegonzac/bug-948975-resume-single-conference-group

Bug 948975 - Safeguard to make sure we can always resume a single held conference call. r=rik
(cherry picked from commit 7354e63bc91309895b85ca711baa5caff2991c73)
Bug 940257 - Uplift bug 934420 and part of bug 937185. r=kats, a=koi+
Bug 940257 - Detect a stale display port in NotifyLayersUpdated and request a content repaint when that happens. r=kats, a=koi+
Bug 939962 = Set pref to enable willReadFrequently software canvas option. r=snorp, a=koi+
Bumping gaia.json for 2 gaia-1_2 revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-1_2/rev/16b5a392e63c
Author: David Flanagan <dflanagan@mozilla.com>
Desc: Merge pull request #15086 from davidflanagan/bug939679v1.2

Merge pull request #14912 from davidflanagan/bug939679

========

https://hg.mozilla.org/integration/gaia-1_2/rev/ed87a17f00a8
Author: David Flanagan <dflanagan@mozilla.com>
Desc: Merge pull request #14912 from davidflanagan/bug939679

Bug 939679: compute the right camera preview size on HD devices r=dmarcos(cherry picked from commit 4245fb93e747d3e3cc9e50ba6fa2f084c9cb682f)

Conflicts:

	apps/camera/js/camera.js