Back out 37c7fcfdb186 (bug 885580) on suspicion of causing linux32 Cipc timeouts
Bug 887125 - Allow 0 for Memory GC Preferences. r=bent
Bug 887185 Plugins test assumes click-to-play is enabled by default - ensure it is enabled for apps that don't yet have it enabled. r=bsmedberg.
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/af314d43e696
Author: Yuren Ju <yurenju@gmail.com>
Desc: Merge pull request #10427 from yurenju/bug848604

Bug 848604 - used apps.list to pick apps from apps/*, external-apps/* & ... r=timdream r=ochameau

========

https://hg.mozilla.org/integration/gaia-central/rev/1fc023b64005
Author: Yuren Ju <yurenju@gmail.com>
Desc: Bug 848604 - used apps.list to pick apps from apps/*, external-apps/* & GAIA_DISTRIBUTION_DIR
Bumping gaia.json for 2 gaia-central revision(s)

========

https://hg.mozilla.org/integration/gaia-central/rev/a936fc5f8ef3
Author: Dominic Kuo <dkuo@mozilla.com>
Desc: Merge pull request #10523 from mozshiao9/master_video_885229

Bug 885229 - [Video] headphoneschange event for videos playing from gall..., r=dkuo

========

https://hg.mozilla.org/integration/gaia-central/rev/b777c6139ca5
Author: Mark Shiao <mshiao@mozilla.com>
Desc: Bug 885229 - [Video] headphoneschange event for videos playing from gallery and camera filmstrip
Bumping gaia.json for 1 gaia-central revision(s)

========

https://hg.mozilla.org/integration/gaia-central/rev/e4d8c96f60dc
Author: Eric O'Connor <eric@bocoup.com>
Desc: Fix bug 883950 - r=gnarf

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

--HG--
extra : rebase_source : b55c49743099532b939d57b673ae7f9a7cfc74da
Merge latest green inbound changeset and mozilla-central
Merge mozilla-central and birch
Merge mozilla-central and fx-team
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
Bug 670087 - AccessibleObjectFromPoint returns incorrect accessible for popup menus, r=tbsaunde, sr=roc
Bug 885169 - Add an explicit backwards-traversing register set iterator, so that code which needs to iterate in a specific order can ask for it explicitly. r=h4writer
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.
Bug 866736 part.3 Replace CRLF in WinIMEHandler.(h|cpp) with LF r=jimm
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>