bug 846197 - removed vivo support information from settings app
Merge pull request #9055 from yurenju/bug-846197-v1.0.1

bug 846197 - removed vivo support information from settings app, r=evelyn, a=tef+
Merge pull request #8008 from borjasalguero/bug_input_grow_sms

Bug 834281 - [SMS] Input Area is not correctly implemeted r=julienw r=rn...(cherry picked from commit 7d66509f70e61619beea1ef5da224c284fede759)
Merge pull request #8978 from davidflanagan/bug856188-v1-train

Merge pull request #8955 from davidflanagan/bug856188(cherry picked from commit a845be046c5d3cb077e3c78f963ca5c079e7ab3d)

Conflicts:

	apps/gallery/js/gallery.js
Merge pull request #9070 from davidflanagan/bug856188-v1.0.1

Merge pull request #8978 from davidflanagan/bug856188-v1-train
Bug 836687 - Set l10n id to elements holding dynamic texts
Merge pull request #9074 from crh0716/v1.0.1_836687

Bug 836687 - Set l10n id to elements holding dynamic texts. r=evelyn, a=tef+
Bug 850256 - Add text prediction to Polish keyboard layout. r=rudyl

This is a backport of 9772fddc53e1b7c137058ea247751239ad25803e to the v1.0.1
branch.  The pl.dict filed compiled for the backport doesn't have changes from
bug 838227, bug 851314 and bug 857239 which landed on master nad v1-train only.
Merge pull request #8956 from ian-liu/bluetooth/Bug835484_localized_bt_file_transfer_notification_status

Bug 835484 - Localized complete and failed strings are not used in BT file transfer notification status r=kaze(cherry picked from commit 899af387a9be0f94f9f68b0c51714ca3de518225)
Merge pull request #9038 from alivedise/bugzilla/854842_v1-train/check-ftu-running-before-changing-active-audio-channel-visibility

Bug 854842 - Check FTU running before visibility change, r=timdream, a=blocking-b2g:tef+(cherry picked from commit 48e6e68da32cb725d5182206c7bbd3490dda05a8)
Bug 853424 - Gecko weirdness in browser app when using non-English locales r=vingtetun
Bug 853424 - follow up; fix lint error
Merge pull request #9058 from gtorodelvalle/dialer-bug-859719-follow-up-to-835750

Bug 859719 - [Dialer] Follow up to bug 835750 - Validate the numbers that are passed to the RIL to dial.(cherry picked from commit 77e291fef67814a3b6149c5076789694ae12e020)
Merge pull request #9037 from marcofreda527/master

Bug 856546 - mozChromeEvent should not cancel overlay timer. r=alive(cherry picked from commit 8a063da1d7ca489238b6c0d926e1d62bd5a018e7)
Merge pull request #9100 from mozsquib/email-imap-deletion

Bug 854048 - Fix batch move/deletion for IMAP messages(cherry picked from commit 083fd866af3e30f35d18a97caf2e7bb2e0a9264f)
Merge pull request #8862 from evelynhung/issue-836276

Bug 836276 - remove "alert-sound.enabled" and "alert-vibration.enabled"(cherry picked from commit 14567d8d55078d74085208a794cac1db206f782a)

Conflicts:

	apps/settings/index.html
Merge pull request #8969 from crdlc/bug-enter-search-perf

Bug 857574 - Contacts app takes long time the first time to enter in sea...(cherry picked from commit 29660ec0a4ad7c90d22e33852e1601d45f781e03)
(cherry picked from commit 3a626ff021a78a1da3e6a2000534156a4ea81fe1)
Merge pull request #8882 from evelynhung/issue-852038

Bug 852038 - update selection mode and scan networks if boot up in manual mode, r=kaze(cherry picked from commit b04dc95dc11a4c375875e56639f16c0be75bafed)