Merge m-c to f-t
Bug 1105590 - Wait for distribution intent to arrive. r=mfinkle
Bug 1098667 - Part 1: Import from android-sync. r=rnewman

--HG--
extra : rebase_source : afa367b0bb0002a6cfda4a1531bc7c47a5f0effa
extra : source : 705b1be87804d5e3427eb433f6445ef055857a89
Bug 1098667 - Part 2: Add "Finish migrating" view to Remote Tabs home panel. r=rnewman

--HG--
extra : rebase_source : f917eda2af5601c154fbd406db9c4d2b83899001
Bug 1080242 - Surface 'Account locked' status. r=rnewman

--HG--
extra : rebase_source : 56a7d340960673d6244ae796755935d89885e986
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/c051a00f86ce
Author: James Burke <jrburke@gmail.com>
Desc: Merge pull request #26542 from goetsu/Bug-1068713---email-box-role-textbox-

Bug 1068713 - email body role textbox r=jrburke

========

https://hg.mozilla.org/integration/gaia-central/rev/4e37609875f5
Author: goetsu <aurelien.levy@free.fr>
Desc: Bug 1068713 - email body role textbox
Bumping manifests a=b2g-bump
Merge m-c to b-i
Merge m-c to f-t
Bug 809561 - Integrate xpcshell test harness with chrome remote debugging. r=past/chmanchester
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/cdbaff53710b
Author: Andrew Sutherland <asutherland@asutherland.org>
Desc: Merge pull request #26566 from asutherland/upgrade-emailjs

Bug 1097421 - [email] Upgrade email.js omnibus bug. r=jrburke

========

https://hg.mozilla.org/integration/gaia-central/rev/c420852c9ac3
Author: Andrew Sutherland <asutherland@asutherland.org>
Desc: Bug 1097421 - [email] Upgrade email.js omnibus bug. r=jrburke

Land https://github.com/mozilla-b2g/gaia-email-libs-and-more/pull/353
See its individual commit comments and the bugs dependent on bug 1097421
for more info.

Note that this also includes 2 autoconfig changes:

- 126.com: This makes us consistent with 163.com, another mail domain also
  operated by netease which also uses the coremail mail server and whose
  ActiveSync implementation does not work so well with our implementation.
  This avoids its autodiscover exposure capturing us and causing us to use
  its ActiveSync implementation.  This is basically required since the
  Mozilla ISPDB is not capable of overriding the ISP's entries.  (Which is
  desired in most cases for many reasons, but being able to say "don't use
  that ActiveSync implementation!" would be helpful.)

- yahoo.co.jp: Right now the ISPDB says to use POP3.  Only with these fixes
  do we work with yahoo.co.jp's IMAP implementation, so (selfishly), it's
  better to do this for now than to change the ISPDB.
Bumping manifests a=b2g-bump
No bug, Automated HSTS preload list update from host b-linux64-ix-0005 - a=hsts-update
No bug, Automated HPKP preload list update from host b-linux64-ix-0005 - a=hpkp-update
No bug, Automated blocklist update from host b-linux64-ix-0005 - a=blocklist-update
Merge m-i to m-c, a=merge
Merge f-t to m-c, a=merge
Merge b-i to m-c, a=merge
Merge m-c to m-i