No bug, Automated HSTS preload list update. a=hsts-update
Bug 1065977 - Uplift recent PSL changes to the release branches. a=bajaj
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-2_0/rev/40e950649487
Author: Ryan VanderMeulen <ryanvm@gmail.com>
Desc: Merge pull request #25519 from luke-chang/1079129_v2.0_fullscreen_prompt_overlay_lockscreen

Bug 1079129 - [Woodduck] Lock screen is hidden by full screen prompt message

========

https://hg.mozilla.org/integration/gaia-2_0/rev/c164e2ea47ee
Author: Luke Chang <lchang@mozilla.com>
Desc: Bug 1079129 - [Woodduck] Lock screen is hidden by full screen prompt message
Bumping manifests a=b2g-bump
Bumping gaia.json for 1 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-2_0/rev/83fe974318c2
Author: mai <mri@tid.es>
Desc: Bug 1088575 - [LockScreen][EmergencyCall]After click 'More info' in app permission, enter emergency call will get all functionalities broken

Conflicts:
	apps/system/test/unit/lockscreen_test.js
Bumping manifests a=b2g-bump
Merge mozilla-b2g32 to 2.0m. a=merge