Bug 909686 - Allow desktop helper extensions to send chromeEvents
Bug 909991 - [Helix] Labels in browser settings are so small it's hard to read
Bug 903913 - [Flatfish]Need script to detect device type for reuse in shared folder
Bug 904068 - Implement build/settings.py in javascript
Merge pull request #11475 from cctuan/903913

Bug 903913 - [Flatfish]Need script to detect device type for reuse in shared folder
Merge pull request #11804 from yurenju/settingsJS

Bug 904068 - Implement build/settings.py in javascript r=timdream
Merge pull request #11807 from cctuan/bug909991

Bug 909991 - Labels in browser settings are so small it's hard to read. r=daleharvey
Bug 906627 - [Camera][Helix] The flash light is still open after user pressed the home button
Bug 906096 - Switch InputMethod to WebIDL in IME tests and FF Nightly
Merge pull request #11645 from comoyo/new_ime_webidl

Bug 906096 - Switch InputMethod to WebIDL in IME tests and FF Nightly. r=RudyL
Revert "Bug 903913 - [Flatfish]Need script to detect device type for reuse in shared folder" for breaking the build

This reverts commit 8d38c52846818b0cf6f16fed7fcc4eae47c940b1.
Bug 907941 - gaia-ui-tests-pushbot (see bug)
Bug 891762 - Add an application for displaying WAP Push messages
Revert "Bug 904068 - Implement build/settings.py in javascript" on suspicion of breaking the build

This reverts commit fd2b0c5165af890b811b283345efdbce054ddb17.
Revert "Merge pull request #11750 from yurenju/909190"

This reverts commit adb9190fedfafa89174f32e1eb520763b7b26fc3, reversing
changes made to 43cf923c3020d77a9fa962cc0c30fd27f647660d.
Revert "Merge pull request #11710 from lightsofapollo/fix-emails-build-system"

This reverts commit b8c30703e2898448c4ccf0032319bba16b1c5173, reversing
changes made to 14f47e5390f6fb9b0c4c841f34024870b7052cfb.
Revert "Bug 908698 - Gaia unit tests: /bin/bash: ./xulrunner-sdk-26/bin/run-mozilla.sh: No such file or directory r=ochameau"

This reverts commit cb1ef14cfd641ed2d6ba99402af57f28ae35dbc2.

Conflicts:
	Makefile
Revert "Bug 906316 - Don't download the xulrunner SDK each time we change a branch if their configuration are different r=yurenju"

This reverts commit 726777cbe7dc4f3a3731fcf4629bea56c352a603.
Merge pull request #11637 from gabrielesvelto/bug-891762-wap-push

Bug 891762 - Add an application for displaying WAP Push messages r=timdream
Merge pull request #11776 from comoyo/chrome_ev_desktop2

Bug 909686 - Allow desktop helper extensions to send chromeEvents