Bug 929062 - Use aurora on 1.2 and update marionette client to version which is compatible with gecko 26
Bug 899995: [v1.2] Remove Homescreen section from Settings. r=vingtetun
Merge pull request #12269 from gtorodelvalle/dialer-bug-910188-closing-contact-list

Dialer bug 910188 closing contact list (r=jmcanterafonseca)(cherry picked from commit 30f92b6b041db172c34059d9e7878d8730b5b4ca)

Conflicts:
	apps/communications/contacts/js/views/list.js
Merge pull request #13180 from comoyo/remove_homescreen_section

Bug 899995: [v1.2] Remove Homescreen section from Settings. r=vingtetun
Merge pull request #13043 from wanderview/contacts-size-reflow

Bug 921685: Read device geometry info from cookie to avoid sync reflows. r=arcturus
Merge pull request #13075 from wanderview/contacts-export-search-select

Bug 930693: Fix checkbox select in export search mode. +shepherd r=arcturus
Merge pull request #13148 from lightsofapollo/bug-929062

Bug 929062 - Use aurora on 1.2 and update marionette client to version w...
Bug 911934 - Honor the expiration date if present in a message r=julienw
Bug 932430: Fix travis by cherry-picking lazy_loader.js changes from 96da5a1bad1
Merge pull request #13195 from wanderview/shared-lazyloader-v1.2

Bug 932430: Fix travis by cherry-picking lazy_loader.js changes from 96d...
Bug 916730 - Intermittent integration test failure "notification tests email notification should not wake screen"
Merge pull request #13201 from mikehenrty/fix-1.2

Bug 916730 - Intermittent integration test failure "notification tests e...
Bug 932542 - vbump marionette apps to 0.3.1 +shepherd
Disable calendar create event integration test
Merge pull request #13202 from lightsofapollo/v1.2-fix-app-clos

Bug 932542 - vbump marionette apps to 0.3.1 +shepherd
Bug 917044 - Run gjslint, unit tests and integration tests in parallel
Merge pull request #13204 from lightsofapollo/enable-parallel-v1.2

Bug 917044 - Run gjslint, unit tests and integration tests in parallel
Bug 916305 - Gaia ui test travis setup
Bug 928631: support sym linked b2g in gaia-ui-test
Merge pull request #13205 from lightsofapollo/v1.2-gaia-ui-tests-travis

V1.2 gaia ui tests travis