Bug 814037 - Check overflow x and overflow y when doing visibility checks with Marionette. Atom updated. r=mdas a=test-only
Bug 823803 - Add L2CAP/EL2CAP Socket support. r=qdot, r=gyeh, a=tef+

This version of BlueZ from Code Aurora has added GOEP_PSM to Object
Push Profile service record, which means that remote devices may
connect with us via both L2CAP and RFCOMM. This patch completes
L2CAP/EL2CAP socket implementation.
Bug 823803 - Manage two server sockets (RFCOMM/EL2CAP) in BluetoothOppManager. r=mrbkap, r=gyeh, a=tef+

In order to solve the problem, BluetoothOppManager should maintain
two server sockets at the same time, one is RFCOMM socket, another
is EL2CAP socket.
Bug 859727 - Should set force to FORCE_NONE after Sco is disconnected. r=echou, a=leo+
Bug 860892 - IPC failure handling in CompositorChild and ShadowLayers. r=jmuizelaar, a=tef+
Bug 856001 - Built-in file picker dialog does not populate file input. r=mounir, a=lsblakk
Bug 858454 - Deliver MozKeyboard key events from the event loop instead of synchronously. r=fabrice, a=gal
Bug 832946 - Ignore numbers start with '#' or '*' and end with '#'. r=gwagner, a=leo+
Bug 839141: Update NSPR to NSPR 4.9.5, as required by NSS 3.14.3, a=akeybl

--HG--
extra : rebase_source : b22ab0bda2edac929cc999d4a4f03a21b2fea67d
Bug 839141: Update NSS to NSS 3.14.3 (NSS_3_14_3_RTM), a=akeybl, r=me

--HG--
extra : rebase_source : aecf198f5365051f1dd214a0d3c0ac43131532f5
Bug 843445 - B2G MMS: provide nsIDOMMobileMessageManager.retrieveMMS() to retrieve MMS for the deferred retrieval mode, part-1:idl part. r=vyang, sr=sicking

Conflicts:
	dom/mobilemessage/interfaces/nsIDOMMobileMessageManager.idl
Bug 843445 - B2G MMS: Provide nsIDOMMobileMessageManager.retrieveMMS()  to retrieve MMS for the deferred retrieval mode, part-2:mms_service. r=vyang, r=gene.lian, sr=sicking
Bug 838467 1/5: use DOMCursor instead of SmsCursor. Interface changes. sr=sicking, r=bent

Conflicts:
	dom/mobilemessage/interfaces/nsIDOMSmsManager.idl
Bug 838467 2/5: DOM implementation. r=sicking,bent

Conflicts:
	dom/mobilemessage/interfaces/moz.build
	dom/mobilemessage/src/MobileMessageCallback.cpp
	dom/mobilemessage/src/SmsCursor.cpp
	dom/mobilemessage/src/SmsManager.cpp
	dom/mobilemessage/src/SmsMessage.h
	dom/mobilemessage/src/SmsRequest.cpp
	dom/mobilemessage/src/SmsRequest.h
Bug 838467 3/5: IPC. r=sicking,bent
Bug 838467 4/5: RIL. r=gwagner
Bug 838467 5/5: test cases. r=gwagner
Bug 849739 1/4 - WebSMS: Replace GetThreadList() with DOMCursor based GetThreads(). Interface changes. sr=mounir, r=bent
Bug 849739 2/4: DOM. r=mounir,mrbkap

Conflicts:
	dom/mobilemessage/interfaces/moz.build
	dom/mobilemessage/src/MobileMessageCallback.cpp
	dom/mobilemessage/src/SmsRequest.cpp
	dom/tests/mochitest/general/test_interfaces.html
Bug 849739 3/4: IPC. r=bent