Backed out changeset 6c3eb5fd4ade (bug 906839)
Backed out changeset 9eaf00ec189a (bug 906839) on suspicion of increasing the failure rate of browser_frameworker.js
Bug 895561 - 'Edit As HTML' option in the markup view - toolkit changes, r=fitzgen
Bug 895561 - 'Edit As HTML' option in the markup view - browser changes, r=jwalker
Bug 928144 - Make Manifest Editor read-only for hosted apps. r=paul

--HG--
extra : rebase_source : 66b5c3aaab33ba714e4740bbf54d20ffa40e2132
Bumping gaia.json for 2 gaia-central revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/22f08f35e21e
Author: Timothy Guan-tin Chien <timdream@gmail.com>
Desc: Merge pull request #13009 from comoyo/close-lockscreen-spans

Bug 929479 - Close 'span' elements in lockscreen passcode pad, r=timdream

========

https://hg.mozilla.org/integration/gaia-central/rev/a86162e89beb
Author: Sergi Mansilla <sergi.mansilla@gmail.com>
Desc: Bug 929479 - Close 'span' elements in lockscreen passcode pad
Merge m-c to f-t
Merge m-c to b-i
Bug 928579 - Backout bug 793906 to re-enable desktop Signin-to-Web UI. f=ozten,r=dolske
Backout e7a4fe2d9e5e (Bug 818353) due to causing bug 929815.
Backout 3867f316204e (Bug 818353) due to causing bug 929815.
Backout 033a0cdb8c03 (Bug 818353) due to causing bug 929815.
Backout c6a0d5f696ec (Bug 818353) due to causing bug 929815.
Backout 32307c4a20bc (Bug 818353) due to causing bug 929815.
Bumping gaia.json for 2 gaia-central revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/c8b2d242ca99
Author: Alive.Kuo <alegnadise@gmail.com>
Desc: Merge pull request #13006 from alivedise/bugzilla/929285/soft-home-height

Bug 929285 - Predefine appWindow height with software home button enable...r=timdream

========

https://hg.mozilla.org/integration/gaia-central/rev/e08038e3d5ef
Author: Alive Kuo <alegnadise@gmail.com>
Desc: Bug 929285 - Predefine appWindow height with software home button enabled
Bumping gaia.json for 2 gaia-central revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/3ff89cdffb83
Author: James Burke <jrburke@gmail.com>
Desc: Merge pull request #13014 from jrburke/bug802643-email-activity-return

Bug 802643 - [email] Compose/share activities are unable to return to calling app once message is sent r=asuth

========

https://hg.mozilla.org/integration/gaia-central/rev/5c25e7eab3a7
Author: jrburke <jrburke@gmail.com>
Desc: Bug 802643 - [email] Compose/share activities are unable to return to calling app once message is sent
Bug 932127 - correctly configure ctypes in cross compilation conditions; r=glandium

Just unconditionally export things for Android and everything else.
Bug 915311 - Improve MOZ_HOST_BIN warnings; r=ted
Bug 933502 - Make memory reporter mochitests work with ASAN.  r=gps,me.

--HG--
extra : rebase_source : 325ee35d47aa38d1cc28008f449fce5fb3a658fc
Bug 917496 - Disable GPUAdapterReporter because its values are frequently bogus.  r=Hughman.

--HG--
extra : rebase_source : ae3bbbc142dfcf7101aaac94acc52e67e68e97fd