Bug 918383 - Fix app debugging when connecting to a simulator app that isn't installed yet. r=paul
Merge mozilla-central and fx-team
Bug 908878 - Fix for intermittent browser_webconsole_bug_595350_multiple_windows_and_tabs.js | Timed out while waiting for: 4 web consoles {opened|closed}; r=me
Bug 916997 - All lines are joined into one line when copying text from the Web Console; r=past
Bug 791475 - Android updater notification should provide more information like progress. r=snorp
Bug 905226 - Identify custom JSON MIME-types as text. r=vporof

MIME types that can't be identified as textual are base64 encoded before
being shown in the Network Monitor tab of the developer tools. This text
detection wasn't identifying "custom" JSON MIME-types like
"application/x-bigcorp-api-json" as being JSON, and consequently they were
shown in a rather unhelpful base64 form.

This patch extends and liberalizes the isTextMimeType method to identify
these forms correctly.
Bug 913014 - Double clicking on a computed style toggles the matched selectors. r=harth
Bug 917863 - Add XUL context menu back into rule and computed views. r=jwalker
Bug 918588 - Properly support off after once with EventEmitter. r=mratcliffe
Backed out 3 changesets (bug 893446, bug 893011, bug 869543)

Backed out changeset 452ca8b779f3 (bug 893446)
Backed out changeset e1bf70be67ec (bug 893011)
Backed out changeset 60865db5f5dc (bug 869543)
Bumping gaia.json for 2 gaia-central revision(s) a=NPOTB

========

https://hg.mozilla.org/integration/gaia-central/rev/04552334535c
Author: David Flanagan <dflanagan@mozilla.com>
Desc: Merge pull request #11914 from davidflanagan/bug905856

Bug 905856: support locked media files r=johu,dkuo,hsivonen,kaze

========

https://hg.mozilla.org/integration/gaia-central/rev/3b857a772d69
Author: David Flanagan <dflanagan@mozilla.com>
Desc: Bug 905856: support for forward locked wallpaper, ringtones and songs
Bumping gaia.json for 2 gaia-central revision(s) a=NPOTB

========

https://hg.mozilla.org/integration/gaia-central/rev/73f31b3b0853
Author: Jose M. Cantera <jmcanterafonseca@gmail.com>
Desc: Merge pull request #12319 from rnowm/916046

Bug 916046 - Find duplicates button needs an icon

========

https://hg.mozilla.org/integration/gaia-central/rev/f336f7c82927
Author: rnowm <arnau@arnaumarch.com>
Desc: Bug 916046 - Find duplicates button needs an icon
Merge mozilla-central and b2g-inbound
Bumping gaia.json for 2 gaia-central revision(s) a=NPOTB

========

https://hg.mozilla.org/integration/gaia-central/rev/bd449b9d100a
Author: Julien Wajsberg <felash@gmail.com>
Desc: Merge pull request #12297 from julienw/917028-add-more-than-1-contact

Bug 917028 - [B2G][SMS] Compose an SMS: Unable to add more than one reci...

========

https://hg.mozilla.org/integration/gaia-central/rev/7d24de345d5d
Author: Julien Wajsberg <felash@gmail.com>
Desc: Bug 917028 - [B2G][SMS] Compose an SMS: Unable to add more than one recipient from Contacts r=borja

Remove the classList handling from updateComposerHeader because since version
1.1 we support sending multiple contacts.
Bumping gaia.json for 2 gaia-central revision(s) a=NPOTB

========

https://hg.mozilla.org/integration/gaia-central/rev/8d7b64cbf47e
Author: Fernando Jiménez Moreno <ferjmoreno@gmail.com>
Desc: Merge pull request #12329 from ferjm/bug908117.ussdfromcontacts

Bug 908117: [B2G][dialer][tongxiao]Could not send out the USSD command w...

========

https://hg.mozilla.org/integration/gaia-central/rev/981a9726818e
Author: Fernando Jiménez <ferjmoreno@gmail.com>
Desc: Bug 908117: [B2G][dialer][tongxiao]Could not send out the USSD command when the USSD number is saved in the contact. r=jmcantera
Bumping gaia.json for 2 gaia-central revision(s) a=NPOTB

========

https://hg.mozilla.org/integration/gaia-central/rev/e824d612071f
Author: Ben Kelly <bkelly@mozilla.com>
Desc: Merge pull request #12318 from wanderview/contacts-css-opt-2

Bug 918174: Load CSS from contacts index.html  r=jmcf

========

https://hg.mozilla.org/integration/gaia-central/rev/2388edbb9f0c
Author: Ben Kelly <ben@wanderview.com>
Desc: Bug 918174: Load CSS from contacts index.html
Bumping gaia.json for 2 gaia-central revision(s) a=NPOTB

========

https://hg.mozilla.org/integration/gaia-central/rev/4d91a52faace
Author: Francisco Borja Salguero Castellano <borjasalguero@users.noreply.github.com>
Desc: Merge pull request #12249 from reubenmorais/contacts-customization

Bug 891723 - Implement preloaded contacts customization by SIM

========

https://hg.mozilla.org/integration/gaia-central/rev/5410f857e2a1
Author: Reuben Morais <reuben.morais@gmail.com>
Desc: Bug 891723 - Implement preloaded contacts customization by SIM. r=arcturus
Bumping gaia.json for 1 gaia-central revision(s) a=NPOTB

========

https://hg.mozilla.org/integration/gaia-central/rev/4e20b480d24a
Author: Bebe <bebe@mozilla.ro>
Desc: Bug 918743 - xfail test_cards_view_with_three_apps due to bug 915138. r=atriff
Bumping gaia.json for 1 gaia-central revision(s) a=NPOTB

========

https://hg.mozilla.org/integration/gaia-central/rev/570b10d571be
Author: Zac Campbell <zcampbell@mozilla.com>
Desc: Bug 918744 - xfail test_gallery_edit_photo due to causing Gallery app to crash. r=alint
Bumping gaia.json for 2 gaia-central revision(s) a=NPOTB

========

https://hg.mozilla.org/integration/gaia-central/rev/0c00581fd96b
Author: AlinT <trifandreialin@gmail.com>
Desc: Bug 918727 - Update locator for video tests. r=zcampbell r=fstrugariu

========

https://hg.mozilla.org/integration/gaia-central/rev/44a20b1eb2d8
Author: Bebe <bebe@mozilla.ro>
Desc: Bug 918755 - Unxfail camera tests due to bug 913418 was fixed. r=zcampbell r=atrif