Bug 1022862 - Create a manifest just for marionette web-api tests. r=jgriffin, a=test-only
Bug 1013996 - irregexp: Avoid unaligned accesses in ARM code. r=bhackett, a=sledru
Bumping gaia.json for 1 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-2_1/rev/96ffc565a36d
Author: Wilson Page <wilsonpage@me.com>
Desc: Bug 1069200 - [Camera]Rapidly click take button and switch picture/video mode will cause video recording and picture mode in the same time
Bumping manifests a=b2g-bump
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-2_1/rev/bfce01e6a274
Author: Julien Wajsberg <felash@gmail.com>
Desc: Merge pull request #24350 from julienw/1071676-v2.1-run-tests

Bug 1071676 - [Travis] Run tests on v2.1 branch too r=me

========

https://hg.mozilla.org/integration/gaia-2_1/rev/8e977b64c87f
Author: Julien Wajsberg <felash@gmail.com>
Desc: Bug 1071676 - [Travis] Run tests on v2.1 branch too r=me
Bumping manifests a=b2g-bump
Bug 1056251 - Changing to a Firefox window in a different workspace does not focus automatically. r=masayuki a=lmandel
Bug 1064636, upgrade to NSS 3.17.1 release, r=rrelyea, a=lmandel
Bug 1061209 - Disable basic layers OMTC except on linux and e10s. r=mattwoodrow, a=lmandel
Bug 1061827 - Nfc.js serializes all the messages, even in release mode. r=allstars.chh, a=lmandel
Bug 1061993 - Add lock to ifc_* functions. r=chucklee, a=bajaj
Bug 1060623 - Theme switcher in customize mode should only show the five most recently used lightweight themes. r=jaws, a=lmandel
Bug 758857 - Use Wikipedia's HTTPS search by default for Firefox desktop. r=gavin, a=lmandel
Bug 1064636 followup:  Add new function to config/external/nss/nss.def r=khuey  a=bustage  CLOSED TREE
Bug 1064890 - Initialze the date cache cleaner for content processes forked from b2g. r=khuey, a=lmandel
Bug 1059832 - Disallow initiating asynchronous remote JAR channel requests for synchronous operations. r=jduell, a=lmandel
Bug 1060196 - Mark the volume as if we've started unmounting. r=dhylands, a=bajaj
Bug 1071721 - Call destroyDOMRequestHelper on SettingsLock after transaction ends; r=bent a=khuey

--HG--
extra : rebase_source : 911baf6eefe6ac12c39e2cbdfedc8f4b76af9537
Bug 1057376 - Clear the string read buffer between deserializations of CSP policies. r=geekboy a=bajaj

In case when multiple CSP policies are applied it is needed to clear the
temporary string buffer that holds the string of each CSP policy that is
deserialized from the CSP policies stream.
Failing to clear the buffer will result in concatenations of the CSP policies
strings for each consecutive CSP policy that is being deserialized, which will
end in generation and application of invalid CSP policy for all except the
first CSP policy that was set for the document.
Bumping gaia.json for 3 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-2_1/rev/32dddd6a0473
Author: albertopq <apastor@mozilla.com>
Desc: Bug 1056969 - New data/roaming alignment

Conflicts:
	apps/system/js/statusbar.js

========

https://hg.mozilla.org/integration/gaia-2_1/rev/30ce14e502b7
Author: Julien Wajsberg <felash@gmail.com>
Desc: Bug 1052447 - [Messages] when we're in an activity and we delete all messages in the thread, we should close the activity r=azasypkin

========

https://hg.mozilla.org/integration/gaia-2_1/rev/4ab173d1202f
Author: Andrew Sutherland <asutherland@asutherland.org>
Desc: Bug 1058900 - [email] Workaround graphics corruption / memory spikes by cleaning up HTML display logic. r=jrburke