Backed out changeset ff4388261db5 (bug 945753)
Backed out changeset 35a8b1df1374 (bug 945753)
Backed out changeset 78e12d1f3aa2 (bug 940013)
Merge mozilla-central into holly
Backed out changeset c9322fc3ef1b (bug 945583)
Merge mozilla-central into holly
Bug 946116 - Remove unused isResumedSession variable from nsNSSCallbacks.cpp. r=bsmith
Bug 946541 - Fix Skia cache purging. r=gw280
Bumping gaia.json for 2 gaia-central revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/eb3375b96956
Author: Greg Weng <snowmantw@gmail.com>
Desc: Merge pull request #14350 from snowmantw/issue946139

Bug 946139 - [LockScreen] Make lockscreen unlocking strategy customizable

========

https://hg.mozilla.org/integration/gaia-central/rev/bbc0e5695321
Author: Greg Weng (snowmantw) <gweng@mozilla.com>
Desc: Bug 946139 - [LockScreen] Make lockscreen unlocking strategy customizable.
Bumping gaia.json for 2 gaia-central revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/1ab9ef0530a5
Author: Ian Liu <iliu@mozilla.com>
Desc: Merge pull request #14352 from ian-liu/bluetooth/Bug946134_No_need_to_use_filenames

Bug 946134 - [Bluetooth File Transfer] No need to use filename for checking the numbers of sending files in schedule, r=@alivedise

========

https://hg.mozilla.org/integration/gaia-central/rev/dfb7e25b9066
Author: ian-liu <iliu@mozilla.com>
Desc: Bug 946134 - [Bluetooth File Transfer] No need to use filename for checking the numbers of sending files in schedule
Bug 946048 - Reset mPhoneType in BluetoothHFPManager constructor, r=echou
Bug 917982 - The ThreadActor's threadLifetimePool should actually have the same lifetime as the thread; r=jimb
Bug 946074 - Awesomebar cursor processing is inefficient. r=mfinkle
Merge m-c to fx-team
Bug 927128 - Keep GeckoView limited to Nightly only r=glandium
Bug 909967 - Firefox Account Signed-in User module. p=warner,spenrose,zcarter,jedp, r=markh
Bug 944925 - Add an option to switch dynamic toolbar mode. r=mleibovic
Bug 941799 - DevTools themes - variables view should match current theme;r=vporof
Bug 905981 - Have a classic vertical display of stack frames persistently available in the debugger UI, r=rcampbell
Bug 895143 - Sources view groups should show the domain, r=past