Backed out changeset 0ad31c2bda31 (bug 883364)
Backed out changeset 8cc680bb6ba2 (bug 883364) for Android webgl failures on a CLOSED TREE
bug 879963 - part 1 - preserve in-progress font loaders when updating the user font set. r=dbaron
bug 879963 - part 2 - avoid adding duplicate face entries to a user font family. r=dbaron
bug 879963 - test for redundant downloading of a repeated @font-face resource. r=dbaron
Bug 895376 - Make mochitest browser harness distinguish real timeouts from long-running tests.
r=gavin
Bug 895288 - Stop loading earlier in browser_aboutHome.js to avoid console spam of Google css warnings
r=ttaubert
Bug 894042 - Disallow Places from creating async statements after asyncClose().
r=Mano
Bug 895284 - Fix plus tests for caret and selection monocles appearing at the same time after a urlbar tap. r=jwilde
Bug 895243 - Hide selection monocles when the user edge swipes to hide the urlbar. r=mbrubeck
Bug 868674 - Make supportsFloatingPoint() a static function. r=h4writer
---
 js/src/assembler/assembler/MacroAssemblerARM.h    |  6 +++---
 js/src/assembler/assembler/MacroAssemblerARMv7.h  |  6 +++---
 js/src/assembler/assembler/MacroAssemblerMIPS.h   |  6 +++---
 js/src/assembler/assembler/MacroAssemblerSparc.h  |  6 +++---
 js/src/assembler/assembler/MacroAssemblerX86.h    | 12 ++++--------
 js/src/assembler/assembler/MacroAssemblerX86_64.h |  6 +++---
 js/src/ion/AsmJS.cpp                              |  4 ++--
 js/src/jsapi.cpp                                  |  2 +-
 8 files changed, 22 insertions(+), 26 deletions(-)

---
 js/src/assembler/assembler/MacroAssemblerARM.h    |  6 +++---
 js/src/assembler/assembler/MacroAssemblerARMv7.h  |  6 +++---
 js/src/assembler/assembler/MacroAssemblerMIPS.h   |  6 +++---
 js/src/assembler/assembler/MacroAssemblerSparc.h  |  6 +++---
 js/src/assembler/assembler/MacroAssemblerX86.h    | 12 ++++--------
 js/src/assembler/assembler/MacroAssemblerX86_64.h |  6 +++---
 js/src/ion/AsmJS.cpp                              |  4 ++--
 js/src/jsapi.cpp                                  |  2 +-
 8 files changed, 22 insertions(+), 26 deletions(-)

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

========

https://hg.mozilla.org/integration/gaia-central/rev/ab2285ccc529
Author: Ben Kelly <bkelly@mozilla.com>
Desc: Merge pull request #11051 from wanderview/contacts-sort-case

Bug 895149: case-insensitive sort for new contacts.  r=arcturus

========

https://hg.mozilla.org/integration/gaia-central/rev/5a6dc632a05f
Author: Ben Kelly <ben@wanderview.com>
Desc: Bug 895149: case-insensitive sort for new contacts
Bug 890909 - [Contacts API] migration code problem when matching using the substringMatching pref (eg in Brazil). r=gwagner
Bug 894147 - Follow-up: Remove leaky debugging code from BrowserElementParent.jsm.  r=me.

The second version of bug 894147 to land on b2g18 (after it was backed out once) already incorporates this fix.

--HG--
extra : transplant_source : %24i%997Po%92%0F%A5%10%97%94%5E%91%05X%F2%B7%15%20
Bumping gaia.json for 2 gaia-central revision(s)

========

https://hg.mozilla.org/integration/gaia-central/rev/1bf61ff8f2d6
Author: Eitan Isaacson <eitan@monotonous.org>
Desc: Merge pull request #10755 from eeejay/homescreen-a11y-tweaks

Homescreen a11y tweaks

========

https://hg.mozilla.org/integration/gaia-central/rev/cf7e4ddfa314
Author: Eitan Isaacson <eitan@monotonous.org>
Desc: Bug 885404 - Reintroduce hiding non-current pages in homescreen. r=crdlc

This puts back in place a change that was first introduced in 2d4ce6b3fb7f75d140cefeded599022a186db596.
Bumping gaia.json for 2 gaia-central revision(s)

========

https://hg.mozilla.org/integration/gaia-central/rev/57244a3919b7
Author: Mihai Cîrlănaru <mihai@cirlanaru.com>
Desc: Merge pull request #10821 from mcirlanaru/bug_883131

Bug 883131 - [Call-Log] Show different empty call log messages for... r=@gtorodelvalle

========

https://hg.mozilla.org/integration/gaia-central/rev/85c82bcaded6
Author: Mihai Cirlanaru <mihai@cirlanaru.com>
Desc: Bug 883131 - [Call-Log] Show different empty call log messages for the 'All' and 'Missed' tabs. r=gtorodelvalle
Bumping gaia.json for 2 gaia-central revision(s)

========

https://hg.mozilla.org/integration/gaia-central/rev/eddef346a03d
Author: Jonathan Griffin <jgriffin@mozilla.com>
Desc: Merge pull request #11058 from jonallengriffin/895209

Disable system cards_view_test.js on TBPL due to perma-orange

========

https://hg.mozilla.org/integration/gaia-central/rev/c5d33ad2c453
Author: Jonathan Griffin <jgriffin@mozilla.com>
Desc: Disable system cards_view_test.js on TBPL due to perma-orange
Merge m-c to birch.
Bumping gaia.json for 2 gaia-central revision(s)

========

https://hg.mozilla.org/integration/gaia-central/rev/3e4d24ae469e
Author: Dominic Kuo <dkuo@mozilla.com>
Desc: Merge pull request #11061 from dominickuo/revert-bug-857674

Revert "Bug 857674 - [music] hide sublist and player before entering to search mode"

========

https://hg.mozilla.org/integration/gaia-central/rev/5cd122cf7ee6
Author: Dominic Kuo <dkuo@mozilla.com>
Desc: Revert "Bug 857674 - [music] hide sublist and player before entering to search mode"

This reverts commit 1a18886ad9890a7132e3a9eb843e3e02c8481a39.
Bumping gaia.json for 2 gaia-central revision(s)

========

https://hg.mozilla.org/integration/gaia-central/rev/bb795b36fc34
Author: Arthur Chen <crh0716@gmail.com>
Desc: Merge pull request #11050 from fabi1cazenave/i18nDefaultMediaLocation-bug892788

Bug 892788 - [Settings] "Cancel" and "Change" are not localized r=arthurcc

========

https://hg.mozilla.org/integration/gaia-central/rev/532b7b572923
Author: Fabien Cazenave <fabien@cazenave.cc>
Desc:  Bug 892788 - [Settings] "Cancel" and "Change" are not localized