Back out bug 886499 for b2g build bustage.
Bug 886418 - Add MOZJS_{MAJOR,MINOR}_VERSION to js-config.h so that JSAPI differences can be handled at compile time. r=glandium

--HG--
extra : rebase_source : 20d442b10d3facd30d0eaaa603214038eed72baf
Backout 4cdab5388392 (Bug 886474) because of wrong shortcut modifier
Bug 886474 - Stop using Ctrl + ] [ to match brackets in source editor, r=msucan
Bug 867735 - Update to freetype 2.5.0.1, r=jfkthame
Bumping gaia.json for 2 gaia-central revision(s)

========

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

Bug 846494 - Display sleep menu labels on multiple lines if ... r=@alivedise

========

https://hg.mozilla.org/integration/gaia-central/rev/d0715253123a
Author: Mihai Cirlanaru <mihai@cirlanaru.com>
Desc: Bug 846494 - Display sleep menu labels on multiple lines if they overflow. r=alive
Bumping gaia.json for 2 gaia-central revision(s)

========

https://hg.mozilla.org/integration/gaia-central/rev/ff2462b5cbd4
Author: Sam Joch <samuel@guiora.com>
Desc: Merge pull request #10606 from samjoch/bug-829027-SettingsCheckNowButton

Bug 829027 - [Settings] "Check Now" button in Device Information, Softwa... r=:etienne

========

https://hg.mozilla.org/integration/gaia-central/rev/a39cf15c3f07
Author: Sam Joch <samuel@guiora.com>
Desc: Bug 829027 - [Settings] "Check Now" button in Device Information, Software Updates should be disabled when there are no connections available
Bumping gaia.json for 2 gaia-central revision(s)

========

https://hg.mozilla.org/integration/gaia-central/rev/4580fc5120bd
Author: David Flanagan <dflanagan@mozilla.com>
Desc: Merge pull request #10620 from davidflanagan/bug874011

Bug 874011: change auto-correct language and suggestions when user switches keyboards r=mcirlanaru

========

https://hg.mozilla.org/integration/gaia-central/rev/00a499016a2d
Author: David Flanagan <dflanagan@mozilla.com>
Desc: Bug 874011: change auto-correct language and suggestions when user switches keyboards

Don't switch keyboards if the menu is shown but the user selects nothing
Bumping gaia.json for 2 gaia-central revision(s)

========

https://hg.mozilla.org/integration/gaia-central/rev/d0dfefa25da3
Author: Salvador de la Puente González <salva@unoyunodiez.com>
Desc: Merge pull request #10744 from lodr/bug-888206-avoiding-crash-during-startup

Bug 888206 - Avoiding crash during startup
r=arcturus

========

https://hg.mozilla.org/integration/gaia-central/rev/dea42ba078ef
Author: lodr <salva@unoyunodiez.com>
Desc: Bug 888206 - Avoiding crash during startup
Bumping gaia.json for 2 gaia-central revision(s)

========

https://hg.mozilla.org/integration/gaia-central/rev/30c995937da1
Author: Salvador de la Puente González <salva@unoyunodiez.com>
Desc: Merge pull request #10745 from lodr/bug-889367-movistar-peru-configuration

Bug 889367 - Movistar Peru configuration file
r=arcturus

========

https://hg.mozilla.org/integration/gaia-central/rev/b4aca17677e9
Author: lodr <salva@unoyunodiez.com>
Desc: Bug 889367 - Movistar Peru configuration file
Bug 873054 - Disable FHR prefs checkbox if pref is locked; r=rnewman
Bug 884865 - If sites provide a large favicon, use it alone for homescreen shortcuts. r=mfinkle
Bug 884865 - Provide a way to get unscaled favicons from the Java favicon service. r=margaret
Bug 888323 - Stop including prtime.h in nsrootidl.idl. r=ehsan
backout df9231393766 to fix commit message
Bug 884848 - Provide a way to get unscaled favicons from the Java favicon service. r=margaret DONTBUILD
Bumping gaia.json for 2 gaia-central revision(s)

========

https://hg.mozilla.org/integration/gaia-central/rev/e8b3281b9e2c
Author: Gareth Aye <gaye@mozilla.com>
Desc: Merge pull request #10747 from gaye/bug-889405

Bug 889405 - Remove broken css r=lightsofapollo

========

https://hg.mozilla.org/integration/gaia-central/rev/b14d5bbe1c3f
Author: gaye <gaye@mozilla.com>
Desc: Bug 889405 - Remove broken css
Bumping gaia.json for 1 gaia-central revision(s)

========

https://hg.mozilla.org/integration/gaia-central/rev/aa2108bb5f54
Author: Corey Frang <gnarf37@gmail.com>
Desc: Bug 870711 - Fixes URL linking in SMS - r=julienw

* Rewrote LinkHelper to avoid a bunch of edge cases and overlapping links
* Modeled greatly after `android.text.util.Linkify`
* Co-Author credit for @lissyx for starting me out with an awesome unit test suite

Closes gh-10741
Backed out changeset d155557b651c (bug 888323) for bustage.
CLOSED TREE
Merge birch and m-c.