Bug 1023777 - [B2G][Calendar] Account warning icon is bigger than it should
Bug 1013201 - Add in-tree config file for gaia build options used in TBPL, r=zac
Bug 1026846: require the type parameter for FL app view activity
Bug 1024779 - [ringtones] edge gestures doesn't work
Bug 1023784 - [7715][calendar] create/modify/view event L10n
Bug 1018708 - Collection localizations for homescreen + add localizations to shared
Merge pull request #20717 from millermedeiros/1023784-offline-calendar-master

Bug 1023784 - [7715][calendar] create/modify/view event L10n r=gaye
Merge pull request #20641 from millermedeiros/1023777-account-warning

Bug 1023777 - [B2G][Calendar] Account warning icon is bigger than it should r=gaye
Bug 1027487 - Point FMD Client to New Stage Server URLs
Merge pull request #20762 from 6a68/bug-1027487-fmd-server-update

Bug 1027487 - Point FMD Client to New Stage Server URLs
Merge pull request #20642 from jimporter/ringtones-manage-activity

Bug 1024779 - [ringtones] edge gestures doesn't work
Merge pull request #20712 from davidflanagan/bug1026846

Bug 1026846: require the type parameter for FL app view activity r=amac
Merge pull request #20577 from jonallengriffin/tbpl_config

Bug 1013201 - Add in-tree config file for gaia build options used in TBP...
Merge pull request #20730 from lightsofapollo/l10n-collections-shared

Bug 1018708 - Collection localizations for homescreen + add localizations to shared
Bug 1026069 - Remove horizontal scroll from search suggestions. r=kgrandon
Bug 1022985 - SmartCollection is not placed where you tap r=daleharvey
Merge pull request #20765 from KevinGrandon/bug_1022985_collection_position_2

Bug 1022985 - SmartCollection is not placed where you tap
Revert "Merge pull request #20730 from lightsofapollo/l10n-collections-shared" for Gaia-unit failures

This reverts commit a74ed1e3f982633950c2f93bbb46e71be6399da6, reversing
changes made to a07855aedfe8fba42dac3c8506549870c89432c7.
Revert "Bug 1018708 - Collection localizations for homescreen + add localizations to shared"

This reverts commit 5e91d8c81885c93492b128dc1797c8fe1d98fe1a.
Merge branch 'master' of https://github.com/mozilla-b2g/gaia