Bug 794693, part 2: Perform parent reflow state calculation at the box-block interface before setting up child reflow state to prevent crashing when a parent reflow state is assumed to be non-null. [r=dbaron]
Merge m-i to m-c
Merge m-c to m-i
Backout dfe69eabbe47 for crashtest orange. [r=me]

--HG--
extra : rebase_source : 36898d587c098835af796d7588ba24b3b40b0558
Backout 8f09d30d3571 for crashtest orange. [r=me]

--HG--
extra : rebase_source : be0cfd30ce57072b83022f20955fd515041d56ed
Bug 911283 - Introduce nsTArray::SetLengthAndRetainStorage which unlike SetLength does not deallocate/reallocate the internal storage.  Use it in NS_FillArray.  r=bsmedberg
Bug 904784: use a separate critical section for the recording callback r=mwu
Bug 903741: Use new DOMError approach in PeerConnection to get error messages out + unittests r=jesup
Backed out changeset eb46f1ed8c8c (bug 897113) for mochitest-mc failures.
Bumping gaia.json for 2 gaia-central revision(s)

========

https://hg.mozilla.org/integration/gaia-central/rev/ed5a3d6a6f1d
Author: James Lal <james@lightsofapollo.com>
Desc: Merge pull request #11998 from lightsofapollo/email-card-stability

Bug 913625 - Resolve flakey test issues with email reply tests r=lightso...

========

https://hg.mozilla.org/integration/gaia-central/rev/a26cb2fa19b1
Author: James Lal <james@lightsofapollo.com>
Desc: Bug 913625 - Resolve flakey test issues with email reply tests r=lightsofapollo (jrburke did work in other bug)
Bug 898055 - Enable apz in metrofx. r=jimm
Bug 898055 - Disable some apz debug output. r=bbondy
Bug 912931 - Fix for double click events with apz enabled. r=bbondy
Bug 913114 - Fix ref counting in winrt widget's GeckoContentController. r=bbondy
Bumping gaia.json for 3 gaia-central revision(s)

========

https://hg.mozilla.org/integration/gaia-central/rev/23b879f86acc
Author: Alive.Kuo <alegnadise@gmail.com>
Desc: Merge pull request #11999 from alivedise/bugzilla/913610/lockscreen

Bug 913610 - Backout 905116 + 913345

========

https://hg.mozilla.org/integration/gaia-central/rev/03ef720d123b
Author: Alive Kuo <alegnadise@gmail.com>
Desc: Revert "Bug 905116 - Implement Homescreen Window + Homescreen Launcher"

This reverts commit 3876c9129c8a3865eedd3a0ed92939ecf41a6eb1.

========

https://hg.mozilla.org/integration/gaia-central/rev/b22494964be7
Author: Alive Kuo <alegnadise@gmail.com>
Desc: Revert "Bug 913345 - Virtualize homescreen origin"

This reverts commit cdbf027bb90f0d2aa55cc53d11c65497f6f410c4.
Merge inbound to m-c.
Bumping gaia.json for 2 gaia-central revision(s)

========

https://hg.mozilla.org/integration/gaia-central/rev/9c5d02a1f3cc
Author: David Flanagan <dflanagan@mozilla.com>
Desc: Merge pull request #11972 from hotzenklotz/907965_preview_rotation

Bug 907965 - [Gallery] Rotate thumbnail according to EXIF orientation me... r=davidflanagan

========

https://hg.mozilla.org/integration/gaia-central/rev/6da0a99f6e49
Author: Tom Herold <therold@mozilla.com>
Desc: Bug 907965 - [Gallery] Rotate thumbnail according to EXIF orientation metadata
Backed out 7 changesets (bug 907585, bug 873351, bug 864485) for making phones unbootable.

Backed out changeset 001a849303de (bug 873351)
Backed out changeset 8020b3013618 (bug 907585)
Backed out changeset 9039460e09c5 (bug 907585)
Backed out changeset 9464e393a501 (bug 907585)
Backed out changeset d6920653de69 (bug 864485)
Backed out changeset 20ef446b27cd (bug 864485)
Backed out changeset e27c780e1ef5 (bug 864485)
Bug 912149 - [Buri][1.2][Homescreen] Packaged apps don't display correct content when launched from homescreen r=ferjm
Merge m-c to inbound.