Bumping manifests a=b2g-bump
Merge b-i to m-c
Merge m-c to f-t
Bug 969218 - Part 1: Use promise for dial and dialEmergency - webidl. r=hsinyi
Bug 969218 - Part 2: Modify tests. r=hsinyi
Bug 969218 - Part 3: Use promise for dial and dialEmergency - internal interface. r=hsinyi
Bug 969218 - Part 4: Use promise for dial and dialEmergency - dom. r=khuey
Bug 969218 - Part 5: Use promise for dial and dialEmergency - provider. r=hsinyi
Bug 969218 - Part 6: Use promise for dial and dialEmergency - ipc. r=khuey
Bug 687297 - Added Mochitest to verify that the per-presentation base minimum font size is propagated without being influenced by the language-specific global preference.  r=dbaron

This test applies a large value to the font.minimum-size.ja preference, opens a new window, advances the url through an iso-8859-1 page, a Shift-JIS page, and back to an iso-8859-1 page.  If the height of a div containing text on the first iso-8859-1 page and last iso-8859-1 page do not match, then the test is failed.
Bug 977248:  Remove quirk.css rule that selects on an attribute that was only set by the old HTML parser.  r=mrbkap
Bug 968550 - onerror is undefined in processICCIOError. r=yoshi
(no bug) fix a few whitespace issues in nsFlexContainerFrame.cpp. whitespace-only, DONTBUILD
Bug 975501 part 1: Add a XUL prefix to existing internal GRID constants. r=dholbert
Bug 975501 part 2: Add display:{inline-,}grid behind a pref, and a stub nsGridContainerFrame. r=dholbert
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/cba6294f97cb
Author: Diego Marcos <diego.marcos@gmail.com>
Desc: Merge pull request #16679 from dmarcos/bug977422

Bug 977422 - [Camera] When recording fails the controls have to be re en...

========

https://hg.mozilla.org/integration/gaia-central/rev/78b580a4ee08
Author: Diego Marcos <diego.marcos@gmail.com>
Desc: Bug 977422 - [Camera] When recording fails the controls have to be re enabled
Bumping manifests a=b2g-bump
Bug 939562 part 2 - Increase kTrustedScriptBuffer from 40k to 50k on Windows. r=bholley
Bug 976411 - Use ConstructFramesFromItemList in more places, and some minor cleanup.  r=bz
Backed out changeset 1d16baf1f90a (bug 687297)