Bug 1093688 - [PP] ALA bug - Exception not working. r=mt
Bug 1100345 - Make Mulet appear as B2G for Marionette r=jgriffin

When running Gaia Marionette integration tests, we need to talk to Mulet
like if it was a B2G device. We define the "b2g.is_mulet" pref for this
purpose.
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/e0e95c183727
Author: viorelaioia <viorela.ioia@softvision.ro>
Desc: Merge pull request #26601 from chirarobert/bug_1107005

Bug 1107005 - [v2.2] Disable test_call_log_all_calls.py due to Bug 10963...

========

https://hg.mozilla.org/integration/gaia-central/rev/dd84acd3369f
Author: Robert Chira <robertchira@P5075.(none)>
Desc: Bug 1107005 - [v2.2] Disable test_call_log_all_calls.py due to Bug 1096385
Bumping manifests a=b2g-bump
Backed out changeset 168da3cbb27b (bug 1093688) for failing gip tests
Merge mozilla-central to b2g-inbound
Bug 1048676 - Part 1: WebIDL and DOM change. r=smaug, dimi

From 28e46b34f04d20d5f10c14a85e77ec1ac98aad9e Mon Sep 17 00:00:00 2001
---
 dom/apps/PermissionsTable.jsm     | 9 +++++++--
 dom/nfc/nsNfc.js                  | 9 +++++----
 dom/webidl/MozNFC.webidl          | 8 ++------
 dom/webidl/MozNFCPeer.webidl      | 2 +-
 dom/webidl/MozNFCPeerEvent.webidl | 2 +-
 dom/webidl/MozNFCTagEvent.webidl  | 2 +-
 6 files changed, 17 insertions(+), 15 deletions(-)
Bug 1048676 - Part 2: Nfc.js and test case change. r=dimi

From 609631024dbcf07d74c13b15ce201b499e6176dd Mon Sep 17 00:00:00 2001
---
 dom/nfc/gonk/Nfc.js                                | 30 +++++++++++-----------
 .../marionette/test_nfc_checkP2PRegistration.js    |  4 +--
 .../tests/marionette/test_nfc_error_messages.js    |  4 +--
 dom/nfc/tests/marionette/test_nfc_peer.js          |  4 ++-
 4 files changed, 22 insertions(+), 20 deletions(-)
Bug 1103732 - remove getNFCPeer. r=smaug, dimi
Bug 1103732 - Part 2: update test cases. r=dimi

From abdfb00788f359f4ed9bbd502a7e723350e3212d Mon Sep 17 00:00:00 2001
---
 dom/nfc/tests/marionette/test_nfc_peer.js          | 16 ++--------------
 dom/nfc/tests/marionette/test_nfc_peer_sendFile.js |  3 +--
 dom/nfc/tests/marionette/test_nfc_peer_sendndef.js |  5 ++---
 3 files changed, 5 insertions(+), 19 deletions(-)
Bug 1003848 - Don't use sync messaging during BrowserElementChild initialization r=smaug
Bug 1094177: Call |Keystore::Shutdown| to cleanup key store, r=chucklee
Bug 1094177: Fix VIM modelines in implementation of key store, r=chucklee

This patch modifies the VIM modelines in |KeyStore.{cpp,h}| to match
Mozilla's coding style.
Bug 1094177: Convert |KeyStore| to use |{Listen|Stream}Socket|, r=chucklee

With the use of separate listen and stream sockets in |KeyStore|, the
listen socket remains open while |KeyStore| serves a connected client
on the stream socket. When the client disconnected, |KeyStore| continues
to listen for the next connection request.

The old dependency on |UnixSocketConsumer| has been removed.
Backed out changeset fb224386bea8 (bug 1003848) for bustage on a CLOSED TREE
Bumping gaia.json for 4 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/0ae26861a352
Author: albertopq <albert.pastor@gmail.com>
Desc: Merge pull request #26528 from albertopq/1105671-rtl-sim-slot

Bug 1105671 - RTL sim slot numbers should stay LTR r=gmarty

========

https://hg.mozilla.org/integration/gaia-central/rev/5267b43767b5
Author: albertopq <albert.pastor@gmail.com>
Desc: Bug 1105671 - RTL sim slot numbers should stay LTR

========

https://hg.mozilla.org/integration/gaia-central/rev/3f67b84bae3d
Author: albertopq <albert.pastor@gmail.com>
Desc: Merge pull request #26529 from albertopq/1091484-reenable-test

Bug 1091484 - Fixing intermitent test notifications r=dharvey

========

https://hg.mozilla.org/integration/gaia-central/rev/6b0ff5e1c8fb
Author: albertopq <albert.pastor@gmail.com>
Desc: Bug 1091484 - Fixing intermitent test notifications
Bumping manifests a=b2g-bump
Bug 1003848 - Don't use sync messaging during BrowserElementChild initialization r=smaug
Bug 1105974 - Fix more clang/gcc and MSVC warnings in js/src/asmjs and js/src/jit. r=jandem
Bug 1106896 - Improve debug and error reporting in mozSettings. r=qdot

We break down the logging capabilities into two classes: debug and
verbose. Verbose will help to track everything that happens, while debug
should just report error cases. We also augment memory reports with
values to help tracking potential issues like: queue blockage, leaking,
etc.