Bug 903765 - Media Recording - Enable mochitest which used the mozGetUserMedia on b2g. r=jsmith
Bug 907592 - Use viewstubs for loading ViewPager. r=lucasr
Bug 909573 - getManifestFor should accept a manifest url instead of an origin. r=fabrice
Bug 910193 - Uplift Add-on SDK to Firefox
Merge mozilla-central and fx-team
Bug 907316 - Add keyboard shortcuts for opening Scratchpad and the Browser Console to the detached devtools toolbox window. r=dcamp"
Bug 909662 - Fix reference to undefined 'pref' constant. r=ttaubert
Bug 901644 - Allow mach build paths to be specified relative to ; r=gps

--HG--
extra : rebase_source : 529399abba46287f038b679d8db970791ed113f2
Bumping gaia.json for 2 gaia-central revision(s)

========

https://hg.mozilla.org/integration/gaia-central/rev/78d803e8450b
Author: Cristian Rodriguez <crdlc@tid.es>
Desc: Merge pull request #11802 from crdlc/bug-906536

Bug 906536 - [Homescreen] Big icons are overlaped over normal icons

========

https://hg.mozilla.org/integration/gaia-central/rev/ec025372cf11
Author: crdlc <crdlc@tid.es>
Desc: Bug 906536 - [Homescreen] Big icons are overlaped over normal icons
Bumping gaia.json for 2 gaia-central revision(s)

========

https://hg.mozilla.org/integration/gaia-central/rev/a0b4f5cf54c8
Author: George <georgeiscoming@gmail.com>
Desc: Merge pull request #11475 from cctuan/903913

Bug 903913 - [Flatfish]Need script to detect device type for reuse in shared folder

========

https://hg.mozilla.org/integration/gaia-central/rev/3d2e7e418c7e
Author: cctuan <georgeiscoming@gmail.com>
Desc: Bug 903913 - [Flatfish]Need script to detect device type for reuse in shared folder
Bumping gaia.json for 2 gaia-central revision(s)

========

https://hg.mozilla.org/integration/gaia-central/rev/e3077da93a79
Author: Yuren Ju <yurenju@gmail.com>
Desc: Merge pull request #11804 from yurenju/settingsJS

Bug 904068 - Implement build/settings.py in javascript r=timdream

========

https://hg.mozilla.org/integration/gaia-central/rev/c9a6ee3df84f
Author: Yuren Ju <yurenju@gmail.com>
Desc: Bug 904068 - Implement build/settings.py in javascript
Bumping gaia.json for 2 gaia-central revision(s)

========

https://hg.mozilla.org/integration/gaia-central/rev/5ee261f99201
Author: Dale  Harvey <dale@arandomurl.com>
Desc: Merge pull request #11807 from cctuan/bug909991

Bug 909991 - Labels in browser settings are so small it's hard to read. r=daleharvey

========

https://hg.mozilla.org/integration/gaia-central/rev/dec92b33adc3
Author: cctuan <georgeiscoming@gmail.com>
Desc: Bug 909991 - [Helix] Labels in browser settings are so small it's hard to read
Bumping gaia.json for 1 gaia-central revision(s)

========

https://hg.mozilla.org/integration/gaia-central/rev/61d1b4037b74
Author: Greg Weng (snowmantw) <gweng@mozilla.com>
Desc: Bug 906627 - [Camera][Helix] The flash light is still open after user pressed the home button
Bug 906096 - Move InputMethod API behind a pref instead of build option. r=kchen, r=sicking

--HG--
rename : b2g/components/Keyboard.jsm => dom/inputmethod/Keyboard.jsm
rename : b2g/components/MozKeyboard.js => dom/inputmethod/MozKeyboard.js
Bug 909124 - [b2g desktop] shell.js did not get correct mozbrowserloadstart event to send Gaia the pending chromeEvents. r=fabrice
Bumping gaia.json for 3 gaia-central revision(s)

========

https://hg.mozilla.org/integration/gaia-central/rev/ffe6be3d548b
Author: Ed Morley <emorley@mozilla.com>
Desc: Revert "Bug 903913 - [Flatfish]Need script to detect device type for reuse in shared folder" for breaking the build

This reverts commit 8d38c52846818b0cf6f16fed7fcc4eae47c940b1.

========

https://hg.mozilla.org/integration/gaia-central/rev/0bb4ced54eaf
Author: Jan Jongboom <janjongboom@gmail.com>
Desc: Merge pull request #11645 from comoyo/new_ime_webidl

Bug 906096 - Switch InputMethod to WebIDL in IME tests and FF Nightly. r=RudyL

========

https://hg.mozilla.org/integration/gaia-central/rev/712c08778490
Author: Jan Jongboom <janjongboom@gmail.com>
Desc: Bug 906096 - Switch InputMethod to WebIDL in IME tests and FF Nightly
Bumping gaia.json for 4 gaia-central revision(s)
Truncated some number of revisions since the previous bump.

========

https://hg.mozilla.org/integration/gaia-central/rev/28ab56156acd
Author: Julien Wajsberg <felash@gmail.com>
Desc: Revert "Bug 906316 - Don't download the xulrunner SDK each time we change a branch if their configuration are different r=yurenju"

This reverts commit 726777cbe7dc4f3a3731fcf4629bea56c352a603.

========

https://hg.mozilla.org/integration/gaia-central/rev/080732883838
Author: Julien Wajsberg <felash@gmail.com>
Desc: Revert "Bug 908698 - Gaia unit tests: /bin/bash: ./xulrunner-sdk-26/bin/run-mozilla.sh: No such file or directory r=ochameau"

This reverts commit cb1ef14cfd641ed2d6ba99402af57f28ae35dbc2.

Conflicts:
	Makefile

========

https://hg.mozilla.org/integration/gaia-central/rev/059e66386680
Author: Julien Wajsberg <felash@gmail.com>
Desc: Revert "Merge pull request #11710 from lightsofapollo/fix-emails-build-system"

This reverts commit b8c30703e2898448c4ccf0032319bba16b1c5173, reversing
changes made to 14f47e5390f6fb9b0c4c841f34024870b7052cfb.

========

https://hg.mozilla.org/integration/gaia-central/rev/65a55ae637d8
Author: Julien Wajsberg <felash@gmail.com>
Desc: Revert "Merge pull request #11750 from yurenju/909190"

This reverts commit adb9190fedfafa89174f32e1eb520763b7b26fc3, reversing
changes made to 43cf923c3020d77a9fa962cc0c30fd27f647660d.
Bumping gaia.json for 2 gaia-central revision(s)

========

https://hg.mozilla.org/integration/gaia-central/rev/2f7fa802679f
Author: Gabriele Svelto <gsvelto@mozilla.com>
Desc: Merge pull request #11637 from gabrielesvelto/bug-891762-wap-push

Bug 891762 - Add an application for displaying WAP Push messages r=timdream

========

https://hg.mozilla.org/integration/gaia-central/rev/2211adc53961
Author: Gabriele Svelto <gabriele.svelto@gmail.com>
Desc: Bug 891762 - Add an application for displaying WAP Push messages
Merge mozilla-central and b2g-inbound
Backed out changeset 294fde226b78 (bug 909124) for breaking gaia-ui-test