Bug 1045973 - sec_error_extension_value_invalid: mozilla::pkix does not accept certificates with x509v3 extensions in x509v1 or x509v2 certificates. r=keeler, a=sledru
Bug 1058024 - IonMonkey: (ARM) Fix jsapi-tests/testJitMoveEmitterCycles. r=mjrosenb, a=sledru
Bug 1072100 - mix-blend-mode doesn't work when set in JS. r=dbaron, a=sledru
Bug 1067018 - Make sure calloc/malloc/free usages match in Tools.h. r=jwatt, a=sledru
Bug 1071003 - Fix null crash in XULDocument::ExecuteScript. r=smaug, a=sledru
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-2_1/rev/61bfd6983413
Author: viorelaioia <viorela.ioia@softvision.ro>
Desc: Merge pull request #24471 from bebef1987/bt_up

Bug 1073019 - Move import of BluetoothHost into the test to avoid a test...

========

https://hg.mozilla.org/integration/gaia-2_1/rev/bdbf0ee92a26
Author: Bebe <bebe@mozilla.ro>
Desc: Bug 1073019 - Move import of BluetoothHost into the test to avoid a test run crash
Bumping manifests a=b2g-bump
Bug 1062697 - Initialize avrcp play status using the proper value, disable AvRCP 1.5. r=btian, a=bajaj

--HG--
extra : rebase_source : d9b6c9b2fc50acc0000849a7d3303adf5fac4962
Bug 1063066 - [Flame][KK] Bluetooth transfer does not work in Gallery App. r=tzimmermann, a=bajaj

--HG--
extra : rebase_source : d82dfea60b1ada7e08c7e63f1c98dced4720f6c6
Bug 1063046 - Simplify format change for tiled layers. r=mstange, a=bajaj

--HG--
extra : rebase_source : 25caa1bfc92b502347bd1b1427c01dfe5acc0c5a
Bug 1065916 - Make usb/wifi tethering request exclusively executed. r=chucklee, a=bajaj

--HG--
extra : rebase_source : 6377c879b4690e8b6e8fa6aea306212af455acfc
Bug 1069920 - Firefox Accounts auth dialog does not wait for password. r=spenrose, a=bajaj

--HG--
extra : rebase_source : 926feecf62831d599a655dcd0e7c68f553727b00
Bug 1051746 - [MobileID] Get the proper ICC info by service ID. r=spenrose, a=bajaj

--HG--
extra : rebase_source : fe09fbf87e8745f9fd3a4d1ddc4e615b5f649edc
Bug 1071704 - HWC hooks registration should not depend on H/W Vsync. r=sotaro, a=bajaj

--HG--
extra : rebase_source : c869a0067ff7296064810a292e18e786e0cc645b
Bug 1005322 - Implement invalidate hook for HwcComposer2D. r=Sushil, r=mwu, a=bajaj

--HG--
extra : rebase_source : 61465ecff5bab6454de7c2e5b707f8d2edf5437b
Bug 1061435 - Set timeout to fClientWaitSync(). r=nical, a=bajaj

--HG--
extra : rebase_source : 4cefb5e50d6a598a3a8462456ae6e34d8091d5a2
Bug 1058978 - Import XPCOMUtils.jsm in MobileIdentityUIGlue.js. r=fabrice, a=bajaj

--HG--
extra : rebase_source : 8e5d69dee57e4b99bbd4310946bc13c2e32a9677
Backed out changeset 2b181f0523c8 (bug 1058978) because it was the wrong patch for the branch.
 Bug 1058978 - Import XPCOMUtils.jsm in FxAccountsUIGlue.js and MobileIdentityUIGlue.js. r=fabrice, a=bajaj
Bumping gaia.json for 5 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-2_1/rev/9c89a6592352
Author: Eli Perelman <eli@eliperelman.com>
Desc: Bug 1072231 - Adjusting height of generic dialogs to compensate for SHB r=etienne

========

https://hg.mozilla.org/integration/gaia-2_1/rev/530e8d161754
Author: Ghislain 'Aus' Lacroix <aus@mozilla.com>
Desc: bug 1062136 - getScreenshot should check for frontWindow. r=alive

========

https://hg.mozilla.org/integration/gaia-2_1/rev/b1d2bdb3a93e
Author: EragonJ <eragonj@eragonj.me>
Desc: Bug 1061621 - When creating screen lock passcode, passcode doesn't matched.

========

https://hg.mozilla.org/integration/gaia-2_1/rev/28b01987c037
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Bug 1071942 - Do not hide statusbar opacity when rocketbar is focused r=alive

========

https://hg.mozilla.org/integration/gaia-2_1/rev/f616f5dc7b6d
Author: Manuel Casas Barrado <manuel.casasbarrado@telefonica.com>
Desc: Bug 1065062 - [Settings][Downloads] 'Select/Deselect All' buttons are missing from Downloads Edit page. r=arthur.chen

Conflicts:
	apps/settings/test/unit/downloads_list_test.js