Ed Morley 000d251175 Merge latest green b2g-inbound changeset and mozilla-central; a=merge		2014-08-15 16:54:17 +01:00
..
nfc_consts.js	Bug 1053116 - Part 1: update error code in nfc_consts.js. r=dimi	2014-08-15 10:02:01 +08:00
Nfc.js	Bug 1052311 - B2G NFC: remove warnings from Nfc.js and NfcContentHelper.js. r=dimi	2014-08-12 17:04:51 +08:00
Nfc.manifest
NfcGonkMessage.h	Bug 1053116 - Part 2: add error code in NfcGonkMessages.h. r=dimi	2014-08-15 10:04:51 +08:00
NfcMessageHandler.cpp	Bug 1053116 - Part 2: add error code in NfcGonkMessages.h. r=dimi	2014-08-15 10:04:51 +08:00
NfcMessageHandler.h
NfcOptions.h
NfcService.cpp	Bug 1052052 - Hoist Auto*JSContext into nsContentUtils and kill nsCxPusher.{cpp,h}. r=gabor	2014-08-14 18:47:15 -07:00
NfcService.h
nsINfcService.idl