Bug 978711 - 1/2:

Conflicts:
	dom/system/gonk/RadioInterfaceLayer.js
	dom/system/gonk/nsINetworkManager.idl
debug