Bug968061 - [NFC][Gallery][Video] - Prevent the NFC pairing for info view and confirm delete dialog r=johnhu
Bug 1003228 - Remove some graphics options from the developer menu as they are not needed any more. r=janx
Bug 1003228 - Remove the toggle button for APZ from the sleep menu. r=janx
Bug 1003228 - Remove redundant force-enabling of APZ in developer builds. r=janx
deleted closing style which was left behind
Merge pull request #18956 from ckerschb/closingStyle

Bug 858787 - Followup to: Flip the pref to turn on the CSP 1.0 parser for Firefox OS. r=gwagner
Merge pull request #18864 from punamdahiya/Bug968061

Bug968061 - [NFC][Gallery][Video] - Prevent the NFC pairing for info view and confirm delete dialog r=johnhu
Merge pull request #18795 from staktrace/killsettings

Merge pull request #18795 from staktrace/killsettings. r=me
Bug 841422 - Move unit tests for shared code out of gallery r=lightsofapollo
Merge pull request #13303 from KevinGrandon/bug_841422_test_app_for_shared_tests

Bug 841422 - Move unit tests for shared code out of gallery