Bug 1074800 - NfcHandler starts to listen for peerready only when NFC is enabled, r=alive
Bug 1053703 - Merge pre-app.js, app.js and post-app.js to one javascript file r=gduan
Bug 1011000 - Enable audio channel change Gaia UI Tests checking
Merge pull request #24382 from chirarobert/audio_channel

Bug 1011000 - Enable audio channel change Gaia UI Tests checking
Merge pull request #24660 from tauzen/Bug1074800_listen_on_nfc_enabled

Bug 1074800 - NfcHandler starts to listen for peerready only when NFC is enabled, r=alive
Merge pull request #24741 from RickyChien/bug-1053703

Bug 1053703 - Merge pre-app.js, app.js and post-app.js to one javascript file r=gduan
Bug 989562 - Write a test to install & launch a packaged app

Conflicts:
	tests/python/gaia-ui-tests/gaiatest/tests/functional/marketplace/manifest.ini
Bug 989562 - Write a test to install & launch a packaged app

Conflicts:
	tests/python/gaia-ui-tests/gaiatest/tests/functional/marketplace/manifest.ini
Bug 989562 - Write a test to install & launch a packaged app
Bug 989562 - Write a test to install & launch a packaged app
Bug 989562 - Write a test to install & launch a packaged app