Wes Kocher cf559bd6b2 Merge m-c to inbound, a=merge CLOSED TREE		2015-06-10 18:38:28 -07:00
..
gonk	Bug 968520 - Add mozilla::fallible to more FallibleTArray calls. r=froydnj	2015-06-10 14:30:41 -07:00
messages	Bug 1165340 - Part 2: Consult ACE before dispatching HCI system message. r=allstars.chh	2015-06-01 10:39:00 -04:00
tests	Bug 1165340 - Part 3: Update xpcshell tests. r=allstars.chh	2015-06-03 05:06:00 -04:00
MozIsoDepTech.cpp	Bug 1152551, part 2 - Fix mode lines in dom/. r=jst	2015-05-03 15:32:37 -04:00
MozIsoDepTech.h	Bug 1152551, part 2 - Fix mode lines in dom/. r=jst	2015-05-03 15:32:37 -04:00
MozNDEFRecord.cpp	Bug 1152551, part 2 - Fix mode lines in dom/. r=jst	2015-05-03 15:32:37 -04:00
MozNDEFRecord.h	Bug 1152551, part 2 - Fix mode lines in dom/. r=jst	2015-05-03 15:32:37 -04:00
NfcContentHelper.js	Bug 1170053 - [Aries] Not able to share a picture using NFC. r=yoshi	2015-06-03 15:54:55 +08:00
NfcContentHelper.manifest	Bug 1115674 - manifest for NfcContentHelper. r=dimi	2014-12-26 20:41:25 +08:00
moz.build	Bug 916428 - [NFC] APIs for ISO 14443-4 tags (IsoDep Support). r=smaug, r=yoshi	2015-01-13 14:50:24 +08:00
nsINfcContentHelper.idl	Bug 1170053 - [Aries] Not able to share a picture using NFC. r=yoshi	2015-06-03 15:54:55 +08:00
nsNfc.js	Bug 1170053 - [Aries] Not able to share a picture using NFC. r=yoshi	2015-06-03 15:54:55 +08:00
nsNfc.manifest	Bug 1115676 - update contractID for mozNFC. r=smaug, dimi	2014-12-26 20:57:11 +08:00