Bug 852768 - Make AutoMounter use the new settings to support internal/external storage. r=qDot
Bug 862353 - Only enable mozContacts in B2G and mochitests. r=gwagner

--HG--
extra : rebase_source : 914bd36790ae01f83c3f84817b2021f0f7dbcf22
Bug 862353 - Only enable mozSettings in B2G and mochitests. r=gwagner

--HG--
extra : rebase_source : 2b079aa6aca6a65516670cc5adcccf422b5e0261
Bug 862353 - Remove NavigatorPropertyHelper. r=bent
Bug 871440: bypass offline for both B2G emulator ARM & x86. r=jgriffin
Bug 854846: Make UnixSocket's connect function non-block; r=tzimmermann
Bug 863281 - Part 1: Add emergency property in TelephonyCall. r=htsai. sr=mounir.
---
 dom/telephony/nsIDOMTelephonyCall.idl  |    7 ++++++-
 dom/telephony/nsITelephonyProvider.idl |   10 +++++++---
 2 files changed, 13 insertions(+), 4 deletions(-)
Bug 863281 - Part 2: Pass emergency info from ril to dom. r=htsai.
---
 dom/system/gonk/RILContentHelper.js |    5 +++--
 dom/system/gonk/ril_worker.js       |    9 +++++++++
 2 files changed, 12 insertions(+), 2 deletions(-)
Bug 863281 - Part 3: Update emergency property for outgoing call. r=htsai, gyeh.
---
 dom/bluetooth/BluetoothTelephonyListener.cpp |    4 +++-
 dom/telephony/Telephony.cpp                  |   10 ++++++----
 dom/telephony/TelephonyCall.cpp              |   10 +++++++++-
 dom/telephony/TelephonyCall.h                |   10 +++++++++-
 4 files changed, 27 insertions(+), 7 deletions(-)
Bug 863281 - Part 4: Add test for emergency label. r=htsai.
---
 .../test/marionette/test_emergency_label.js        |  172 ++++++++++++++++++++
 1 file changed, 172 insertions(+)
 create mode 100644 dom/telephony/test/marionette/test_emergency_label.js
Bug 863732 - Use RTC wakeup to monitor WebSocket connection. r=jlebar
Bug 868271 - Don't ignore touchend even if event is preventDefaulted. r=vingtetun
Bug 869331 - Flush the SkiaGL canvas before right present. r=gw280
Bug 871788 - RILContentHelper.js line: 987: JavaScript Error: "setting a property that has only a getter". r=mrbkap
Merge m-c to birch.