Bug 1048676 - Part 1: use nfc-share permission in System app.
Bug 1048676 - Part 2: use nfc-share permission in Video app.
Bug 1048676 - Part 3: use nfc-share permission in Gallery app.
Bug 1048676 - Part 4: use nfc-share permission in Music app.
Bug 1048676 - Part 5: use nfc permission in Settings app.
Bug 1048676 - Part 6: use nfc-share in communication app.
Bug 1103732 - remove getNFCPeer
Bug 1106411 - [PrivacyPanel] Change role to system r=marta
Bug 1097889 - [Settings] The user feedback textbox resets if the screen is locked
Bug 1107086 - [v2.2] Fix test_sms_with_attachments.py failure
Bug 1102967 - Cram unread button in message UI
Merge pull request #26503 from allstarschh/Bug1048676_1125b

Bug1048676 - use nfc-share and nfc permission. r=alive, dkuo, arthurcc, francisco
Merge pull request #26517 from allstarschh/Bug1103732b

Bug 1103732 - remove getNFCPeer. r=alive
Bug 1102967 - merge pull request #26597 from KevinGrandon:bug_1102967_give_me_button to mozilla-b2g:master
Bug 1095109 - Update NotificationHelper to use L10n API and new W3C Notification API.  r=etienne,stas,mhenretty,salva
Bug 1093090 - Better, angle based, edge swipe detection.
Merge pull request #26604 from chirarobert/bug_1107086

Bug 1107086 - [v2.2] Fix test_sms_with_attachments.py failure
Merge pull request #26134 from mancas/bug1097889

Bug 1097889 - [Settings] The user feedback textbox resets if the screen ... r=arthur.chen
Bug 1107460 - [v2.2] Update marionette version to 0.8.5
Merge pull request #26252 from etiennesegonzac/bug-1093090

Bug 1093090 - Better, angle based, edge swipe detection. r=kgrandon