Bug 899769 - Fix build of AudioManager.cpp when bluetooth is disabled, r=rlin
Bumping gaia.json for 2 gaia-central revision(s)

========

https://hg.mozilla.org/integration/gaia-central/rev/af7ef38d9a64
Author: David Flanagan <dflanagan@mozilla.com>
Desc: Merge pull request #11231 from davidflanagan/bug896363

Bug 896363: Add an auto-correct dictionary for Catalan r=RudyLu

========

https://hg.mozilla.org/integration/gaia-central/rev/cbdbf160127c
Author: David Flanagan <dflanagan@mozilla.com>
Desc: Bug 896363: Add an auto-correct dictionary for Catalan

also correctly handle and capitalize multi-character key alternatives
Bug 895960 - Part 1: Patch. r=hsinyi
Bug 895960 - Part 2: Test cases for reading PBR. r=hsinyi
Bug 895960 - Part 3: revise parseMccMncFromImsi. r=hsinyi
Bumping gaia.json for 6 gaia-central revision(s)

========

https://hg.mozilla.org/integration/gaia-central/rev/12379f829ad1
Author: Jose M. Cantera <jmcanterafonseca@gmail.com>
Desc: Merge pull request #11247 from jmcanterafonseca/fb_link_broken

Bug 899503 - FB Link is broken after landing bug 895824

========

https://hg.mozilla.org/integration/gaia-central/rev/589c5e9d560c
Author: Jose M. Cantera <jmcanterafonseca@gmail.com>
Desc: Bug 899503 - FB Link is broken after landing bug 895824

========

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

Bug 899422 - [System][HD] lack of image assets

========

https://hg.mozilla.org/integration/gaia-central/rev/4acc89b1bb75
Author: cctuan <georgeiscoming@gmail.com>
Desc: Bug 899422 - [System][HD] lack of image assets

========

https://hg.mozilla.org/integration/gaia-central/rev/8420b76828bb
Author: Jose M. Cantera <jmcanterafonseca@gmail.com>
Desc: Merge pull request #11248 from jmcanterafonseca/fix_fb_passive_mode

Bug 899525 - In passive mode merge do not match existing FB Contacts

========

https://hg.mozilla.org/integration/gaia-central/rev/02a817b06f5e
Author: Jose M. Cantera <jmcanterafonseca@gmail.com>
Desc: Bug 899525 - In passive mode merge do not match existing FB Contacts
Bug 897869 - [b2g-ril] Need to keep CLIR settings across reboots. r=vicamo
Bug 880643 - Part 1: Add a test for coding style check on RIL code by JSHint. r=hsinyi
---
 dom/system/gonk/tests/marionette/manifest.ini      |    1 +
 .../gonk/tests/marionette/ril_jshint/README.md     |    9 +
 .../gonk/tests/marionette/ril_jshint/jshint.js     |11096 ++++++++++++++++++++
 .../gonk/tests/marionette/ril_jshint/jshintrc      |  118 +
 .../gonk/tests/marionette/test_ril_code_quality.py |  353 +
 5 files changed, 11577 insertions(+)
 create mode 100644 dom/system/gonk/tests/marionette/ril_jshint/README.md
 create mode 100644 dom/system/gonk/tests/marionette/ril_jshint/jshint.js
 create mode 100644 dom/system/gonk/tests/marionette/ril_jshint/jshintrc
 create mode 100644 dom/system/gonk/tests/marionette/test_ril_code_quality.py
Bug 880643 - Part 2: Address the suggestion from jshint. r=hsinyi
---
 dom/system/gonk/RILContentHelper.js    |    6 +++---
 dom/system/gonk/RadioInterfaceLayer.js |    2 +-
 dom/system/gonk/ril_worker.js          |    4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)
Merge latest green birch changeset and mozilla-central