Bug 885979 - Add support for enabling Contacts API debugging output at runtime. r=gwagner

--HG--
extra : rebase_source : b55c49743099532b939d57b673ae7f9a7cfc74da
Merge mozilla-central and birch
Bumping gaia.json for 2 gaia-central revision(s)

========

https://hg.mozilla.org/integration/gaia-central/rev/1771b99267b6
Author: Francisco Borja Salguero Castellano <fbsc@tid.es>
Desc: Merge pull request #10584 from rwldrn/885274

Bug 885274 - [SMS/MMS] Option menu. Only execute menu operations when target has an associated action

========

https://hg.mozilla.org/integration/gaia-central/rev/f560e202627e
Author: Rick Waldron <waldron.rick@gmail.com>
Desc: Bug 885274 - [SMS/MMS] Option menu. Only execute menu operations when target has an associated action

https://bugzilla.mozilla.org/show_bug.cgi?id=885274
Signed-off-by: Rick Waldron <waldron.rick@gmail.com>
Bumping gaia.json for 2 gaia-central revision(s)
Truncated some number of revisions since the previous bump.

========

https://hg.mozilla.org/integration/gaia-central/rev/c4e3c4a68451
Author: steveck-chung <schung@mozilla.com>
Desc: Merge pull request #10655 from borjasalguero/weird_sound

Bug 887158 - [SMS] DOMRequest change to an array of [DOMRequest]. r=steveck-chung

========

https://hg.mozilla.org/integration/gaia-central/rev/b0a1e159f16a
Author: borjasalguero <fbsc@tid.es>
Desc: Bug 887158 - [SMS] DOMRequest change to an array of [DOMRequest]. r=schung
Bumping gaia.json for 2 gaia-central revision(s)

========

https://hg.mozilla.org/integration/gaia-central/rev/23f3f5295abf
Author: huchengtw-moz <johu@mozilla.com>
Desc: Merge pull request #9784 from huchengtw-moz/settings/Bug_842252_change_data_call_setting_architecture

Bug 842252 - [B2G][Setting] Change data call setting architecture in Gai...r=@jaoo, r=@arthurcc, r=@fcampo

========

https://hg.mozilla.org/integration/gaia-central/rev/128513a67470
Author: John Hu <johu@mozilla.com>
Desc: Bug 842252 - [B2G][Setting] Change data call setting architecture in Gaia.
Bumping gaia.json for 2 gaia-central revision(s)

========

https://hg.mozilla.org/integration/gaia-central/rev/a16bfd899489
Author: Ben Francis <ben@tola.me.uk>
Desc: Merge pull request #10608 from Cwiiis/master

Bug 817876 - Handle multiple modal dialogs from the same origin r=benfrancis

========

https://hg.mozilla.org/integration/gaia-central/rev/0e7d10d4d3dc
Author: Chris Lord <chrislord.net@gmail.com>
Desc: Bug 817876 - Handle multiple modal dialogs from the same origin
Bumping gaia.json for 2 gaia-central revision(s)

========

https://hg.mozilla.org/integration/gaia-central/rev/da576217a863
Author: Sam Joch <samuel@guiora.com>
Desc: Merge pull request #10580 from pivanov/bug-885925

Bug 885925 - Header in the calendar sidebar is different from the header in the building block r=@samjoch

========

https://hg.mozilla.org/integration/gaia-central/rev/52a95db5f38b
Author: Pavel Ivanov <pivanov@mozilla.com>
Desc: Bug 885925 - Header in the calendar sidebar is different from the header in the building block
Bumping gaia.json for 1 gaia-central revision(s)
Truncated some number of revisions since the previous bump.

========

https://hg.mozilla.org/integration/gaia-central/rev/461e2be993c7
Author: Julien Wajsberg <felash@gmail.com>
Desc: Bug 887356 - Homescreen grid test failing on TBPL r=crdlc

This uses sinon to make this sometimes failing test synchronous.
Bumping gaia.json for 2 gaia-central revision(s)

========

https://hg.mozilla.org/integration/gaia-central/rev/148e5145cad1
Author: Rick Waldron <waldron.rick@gmail.com>
Desc: Bug 870416 - [MMS] Recipients container multiline view takes all available space

- When the screen resizes, generate a CSS rule that calculates the max available height
- Renames an existing element to match the naming convention
- Adds non-html interpolation support to the template matcher regexp
- Ensures that assimilations abide existing behavior rules

https://bugzilla.mozilla.org/show_bug.cgi?id=870416
Signed-off-by: Rick Waldron <waldron.rick@gmail.com>

========

https://hg.mozilla.org/integration/gaia-central/rev/1af738671094
Author: Rick Waldron <waldron.rick@gmail.com>
Desc: Bug 885264 - [SMS/MMS] Ensure Carrier is not displayed for manually entered (unknown contact) recipients

1. If a phone number has carrier associated with it
    the output will be:

  type | carrier

2. If there is no carrier associated with the phone number
    the output will be:

  type | phonenumber

3. If for some reason a single contact has two phone numbers with
    the same type and the same carrier the output will be:

  type | phonenumber

4. If for some reason a single contact has no name and no carrier,
    the output will be:

  type

5. If for some reason a single contact has no name, no type
    and no carrier, the output will be nothing.

https://bugzilla.mozilla.org/show_bug.cgi?id=885264
Signed-off-by: Rick Waldron <waldron.rick@gmail.com>
Bumping gaia.json for 2 gaia-central revision(s)
Truncated some number of revisions since the previous bump.

========

https://hg.mozilla.org/integration/gaia-central/rev/22af4c7c1801
Author: Sergi Mansilla <sergi.mansilla@gmail.com>
Desc: Merge pull request #10674 from comoyo/vcard_utf8_2

Bug 885546 - VCF importer saves type="UTF-8" in contact fields [r=arcturus]

========

https://hg.mozilla.org/integration/gaia-central/rev/92aa02991dfe
Author: Sergi Mansilla <sergi.mansilla@gmail.com>
Desc: Bug 885546 - VCF importer saves type="UTF-8" in contact fields [r=arcturus]
Bumping gaia.json for 1 gaia-central revision(s)

========

https://hg.mozilla.org/integration/gaia-central/rev/dfacedfab904
Author: Anthony Ricaud <anthony@ricaud.me>
Desc: Revert "Bug 883787 - Translate the code in HTML comments in the build process"

This reverts commit 53eea8a3da5ae1de3de471a0b1d48aafdd7e81ce.
Merge birch to m-c