Bug 925266 - Setup gaia-ui-tests HTML report creation for Travis artifacts r=lightsofapollo
Bug 950307 - [DSDS] Settings: rename sim-manager-outgoing-data-desc

- update this string in master
Bug 948798 - [Cost Control] After reset Wifi usage, the usage does not be reset
Bug 955991 - [Gaia][Build] Unit Test for settings.js
Merge pull request #14989 from cctuan/955991

Bug 955991 - [Gaia][Build] Unit Test for settings.js
Disable 'layers.composer2d.enabled' (checkbox 'Enable hardware composer' in Settings app) on flatfish
Merge pull request #15003 from dwi2/bug956193

Disable 'layers.composer2d.enabled' (checkbox 'Enable hardware composer'...
Merge pull request #14533 from zacc/bug_925266

Bug 925266 - Setup gaia-ui-tests HTML report creation for Travis artifac...
Bug 912825 - [email] Message reader appears to duplicate body contents when buildBodyDom is called multiple times. r=asuth
Merge pull request #15010 from mcav/downloadbodyreps-idempotent

Bug 912825 - [email] Message reader appears to duplicate body contents when buildBodyDom is called multiple times. r=asuth
Merge pull request #14633 from gitmai/bug-948798-CC-reset-wifi-not-refresh

Bug 948798 - [Cost Control] After reset Wifi usage, the usage does not b...
r=me
Bug 952724 - Make InputContext#replaceSurroundingText match spec. r=djf
Merge pull request #15013 from comoyo/952724

Bug 952724 - Make InputContext#replaceSurroundingText match spec. r=djf
Bug 956192 - Remove legacy open search file
Merge pull request #15017 from KevinGrandon/bug_956192_remove_legacy_opensearch

Bug 956192 - Remove legacy open search file r=me
Bug 950080 - add grunt jsdoc generator to gaia
Merge pull request #15011 from gasolin/issue-950080-2

Bug 950080 - add grunt jsdoc generator to gaia, r=timdream
Merge pull request #14872 from EragonJ/bug-950307

Bug 950307 - [DSDS] Settings: rename sim-manager-outgoing-data-desc
Bug 949857 - [Gallery]Red 'Delete' shown when deleting in multiple selection mode, blue "Ok" shown when deleting in fullscreen mode
Merge pull request #14682 from huchengtw-moz/gallery/Bug_949857_make_delete_consistent

Bug 949857 - [Gallery]Red 'Delete' shown when deleting in multiple selec..., r=djf