Bug 1059813: Use getter/setter methods of |UnixSocketRawData| in NFC helpers, r=allstars.chh
Bug 1059813: Use getter/setter methods of |UnixSocketRawData| in RIL helpers, r=vyang
Bug 1059813: Use getter/setter methods of |UnixSocketRawData| in Bluetooth, r=btian
Bug 1059813: Protect access to fields of |UnixSocketRawData|, r=qdot

This patch adds protection for fields of |UnixSocketRawData| by
making them private.
Bug 1064470 - Increase the experiments forensic log buffer size again. r=bsmedberg
Bug 1067117 - Typo in Sqlite.jsm: REASON_CANCELLED should be REASON_CANCELED r=mak
Bug 1047469 - Implement search terms hilighting r=dao
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/afdc134ec6c5
Author: Francisco Jordano <arcturus@ardeenelinfierno.com>
Desc: Merge pull request #23629 from arcturus/bug-1061413

Bug 1061413 - [Contacts] Favorites on top of ICE if ICE set first, and Favorites set later r=sergi

========

https://hg.mozilla.org/integration/gaia-central/rev/a5d8cd669f14
Author: Francisco Jordano <arcturus@ardeenelinfierno.com>
Desc: Bug 1061413 - [Contacts] Favorites on top of ICE if ICE set first, and Favorites set later
merge b2g-inbound to mozilla-central a=merge
Bumping manifests a=b2g-bump
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/5fefe5cca49d
Author: Fernando Rodríguez Sela <frsela@tid.es>
Desc: Merge pull request #22619 from frsela/Bug861914_optgroup

Bug 861914 - [Browser] Forms are not displayed correctly, r=etienne

========

https://hg.mozilla.org/integration/gaia-central/rev/81682cd9980a
Author: Fernando Rodriguez Sela <frsela@tid.es>
Desc: Bug 861914 - [Browser] Forms are not displayed correctly, r=etienne
Bumping manifests a=b2g-bump
Backed out changeset c1cc52b986f8 (bug 1049258) for breaking non-unified windows builds
merge mozilla-inbound to mozilla-central a=merge
merge fx-team to mozilla-central a=merge
Merge m-c to b2g-inbound
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/f2c5898e2690
Author: Gabriele Svelto <gsvelto@mozilla.com>
Desc: Merge pull request #23725 from iFadey/bug-990047

Bug 990047 - Add a shared function to load JSON files r=gsvelto

========

https://hg.mozilla.org/integration/gaia-central/rev/ce07e38a0199
Author: Fawad Hassan <ifadey@ymail.com>
Desc: Bug 990047 - Add a shared function to load JSON files
Bumping manifests a=b2g-bump
Bug 1053016 - Part 1: remove libomxpluginfroyo.so from Android package. r=nalexander
Bug 1053016 - Part 2: remove Froyo conditional from AndroidMediaPluginHost.cpp. r=blassey