Merge pull request #10458 from Rik/disable-travis

Bug 884217 - Disable travis on v1.1.0hd r=yurenju(cherry picked from commit 48c005e720aaf810edc5d67ac2aa983dbbca47e1)
Bug 881127 - Support GAIA_DEV_PIXELS_PRE_PX for devices with different screen pixel density
Merge pull request #10499 from yurenju/ratio-v1.1.0hd

Bug 881127 - Support GAIA_DEV_PIXELS_PRE_PX for devices with different s... r=timdream
Merge remote-tracking branch 'origin/v1-train' into v1.1.0hd
Merge pull request #10229 from lightsofapollo/hide-loading-area

Bug 876796 - Hide event details until they are loaded.
Bug 852836 - Flip front camera preview to correct direction
Merge pull request #10558 from rexboy7/fix-bug852836-v1.1.0hd

Bug 852836 - Flip front camera preview to correct direction
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
Merge remote-tracking branch 'origin/v1-train' into v1.1.0hd
Bug 852321: Update xulrunner SDK to reduce download time. r=ochameau
(cherry picked from commit f7fffb5bf8caa8170f3a0d821ab1f7a195a244c0)
Bug 881248 - [MMS] Multirecipient. A contact with >1 number must only render the relevant number (vs. rendering all) r=julienw

Signed-off-by: Rick Waldron <waldron.rick@gmail.com>
(cherry picked from commit 6406b9a535b5fcd7143a6ccb58c03a3a7b4296c5)

Conflicts:
	apps/sms/test/unit/mock_utils.js
Bug 840038 - [MMS][User Story] Image rescaling to 300kB(Apply to composer attachment) - r=gnarf

Adds resizing step in Composer
Adds a resizing notification
Adds Composer.isResizing
Only show file too large error when not an image
Refactors getting mmsSizeLimitation
Defaults to 300k for mmsSizeLimitation
Adds "resize-image" locale string
Adds number: 1 to pick action

Closes gh-9854
(cherry picked from commit dea31788f6da0abcd9e6d83f7dbf26b89c6f8063)

Conflicts:
	apps/sms/manifest.webapp
Merge pull request #10321 from borjasalguero/message_activity_proposal

Bug 880115 - [SMS / MMS] Activity handling does nothing when triggering ...(cherry picked from commit 5026dfab780b3d5205d419b9979baeebcd12bf73)
Bug 814840 - Isolate FTU Launcher from Window Manager

Conflicts:
	apps/system/index.html
	apps/system/js/window_manager.js
	apps/system/style/system/system.css
	apps/system/test/unit/captive_portal_test.js
Merge pull request #10590 from oconnore/879203-homescreen-opacity

Bug 879203 - opacity transition in home screen is not smooth r=crdlc(cherry picked from commit d45b4889fa5ba6dc6400aedf1310521d5d09948b)

Conflicts:
	apps/homescreen/js/grid.js
Revert "Bug 854842 - Check FTU running before visibility change"

This reverts commit ee55b12d8bf8fcfc49f271e7f4a1086f47eeea96.
Because we are uplifting bug 814840 to v1-train.
Revert "Bug 875646 - Bypass FTU sim lock checking"

This reverts commit 5af655da5ba0bc48d4c69a0b668112321f1dd6be.
Because we're uplifting bug 814840 to v1-train.

Conflicts:
	apps/system/js/sim_lock.js
	apps/system/js/window_manager.js
Revert "Bug 831697 - White screen after receive a call in FTE"

This reverts commit 0106127dff01dc98d90ad394cc69fd0d67cd2230.
Because we're uplifting bug 814840 to v1-train.
Uplifting 814840 - resolve conflict of bug 875646, reverting
aa166a4f3c03917d208a347fe96303fcad58f0fa
Merge pull request #10633 from alivedise/bugzilla/814840_v1-train

Bug 814840 - Uplift FTU launcher to v1-train,
Backout bug 854842, bug 875646, bug 831697, bug 877062 on v1-train. r=timdream, a=leo+