Bug 883737 - [Bluetooth][File-Transfer] screen layout size is exceeded in Bluetooth Transfer pop-up screen
Merge pull request #10565 from ian-liu/v1_train/Bug883737_screen_layout_size_is_exceeded_in_pop_up_dialog

Bug 883737 - [Bluetooth][File-Transfer] screen layout size is exceeded in Bluetooth Transfer pop-up screen(v1-train), r=@alivedise
Merge pull request #10340 from jaoo/882089

Bug 882089 - Automatic channel configuration for 1.1/DT PL, r=kaze(cherry picked from commit d8df0e4e27d1822f3607e3b2582df318ec653a7f)

Conflicts:
	shared/resources/apn/apns_conf_local.xml
Bug 882095 - Restart the connection only when APN related settings changed(cherry picked from commit 2af068e72bcda7fa37b2bcd00de4d78f999370f9)
Merge branch 'issue-853349' of git://github.com/gasolin/gaia into gasolin-issue-853349

Conflicts:
	apps/camera/js/camera.js
Merge pull request #10304 from jedp/get-rp-tests

Bug 881435 - UI Tests for navigator.mozId.get(); r=ferjm

(cherry picked from commit 278d090ceada5ac7ab0519116cd23a3f2be42267)

Conflicts:
	test_apps/uitest/index.html
Merge pull request #10585 from jedp/get-rp-tests-v1-train

Bug 881435 - UI Tests for navigator.mozId.get(); r=ferjm
Merge pull request #10535 from AntonioMA/master

Bug 885682: Allow including preference files from GAIA_DISTRIBUTION_DIR r=ochameau
(cherry picked from commit d9f163c5eb3ba97b08b1009b9b6e2b53d09ae776)
Merge pull request #10287 from crdlc/bug-877889-v2

Bug 877889 - JavaScript Error: TypeError: nextCard is null or TypeError:...
(cherry picked from commit 7e6abee2fc509e3030ce831e6418893d61c9c4b9)
Bug 883813 - [SMS][Translation][Spanish][Portugues] Some tokens are not translated r=julienw

In order to support a variable width of the "To:" field in the
Recipients section, some restructuring is necessary.

(cherry picked from commit 4b1359c18031b20eac667952a9e50b3729fbaa9e)
Merge pull request #10506 from fabi1cazenave/simpleLocalize-bug882591

Bug 882591 - l10n.js should expose an asynchronous `localize()' method, r=timdream
(cherry picked from commit f8efe1a25aeaa7fd5443ba2bf2a823f7dc266864)
Merge pull request #10157 from evanxd/bug-870756

Bug 870756 - [SMS] No Notification sound when SMS class 0(popup) is recived
(cherry picked from commit e2f19420fa6a26c4287588701efaec09a750dba1)
Merge pull request #10460 from crdlc/bug-884225

Bug 884225 - [B2G] [Leo][Contacts][Facebook] The last name of a linked F...
(cherry picked from commit eb7f9aec277611e93f460da033c3861a26465d15)
Merge pull request #10526 from cctuan/884692

Bug 884692 - [Email] Not able to unset the flag icon from the message vi... r=asuth
(cherry picked from commit 28d1521b981e889494c4c8f8b797121fe71f56d2)
Merge pull request #10403 from asutherland/bug-883035

Bug 883035 - [Email] Folder list card "last sync" label can overlap the settings icon; visible on pt-BR locale. r=psingapati
(cherry picked from commit 4df544b615e4c80f415bcb230d28f35e7f8151c7)
Merge pull request #10505 from leob2g/Bug_883032_Browser_media_save_error

Bug 883032 Browser media save error. r=benfrancis
(cherry picked from commit bc9f5fb41adbfad9eec33b3878ba06a6eea6af26)
Merge pull request #10435 from dominickuo/bug-880571

Bug 880571 - [video] handle error codes for video element. r=daleharvey
(cherry picked from commit 447c6f665d0a2908a9b0b88f575e8c2233887dfb)
Merge pull request #10537 from fabi1cazenave/obsoleteDialerStrings-bug885700

Bug 885700 - Remove obsolete strings from the Dialer locale
(cherry picked from commit 36644b4d9a7f57ba2667db59e05c0259ab5642ad)
Merge pull request #10306 from dominickuo/bug-857674

Bug 857674 - [music] hide sublist and player before entering to search mode, r=RudyLu
(cherry picked from commit a24caa3b5024e3c2c7e57f9cc58504584c98d6c2)
Merge pull request #10528 from lodr/bug-883816-localizing-html-entities

Bug 883816 - Now localizing HTML entities properly
r=arcturus
(cherry picked from commit 8edb0fa138a78676aed18d9492abb4f47d0bc069)