Bug 940554 - Fix Marionette's newSession to return capabilities. r=mdas
Bug 963258 - Prevent exception when using webconsole in alarm code. r=gene
Bug 964239 - Ignore invalid URIs rather than stopping completely. r=hsivonen
Bug 964239 - Give selected channels awareness of srcdoc base URI. r=bz
Bug 964239 - Docshell and session history changes to add baseURI information to srcdoc loads. r=bz
Bug 964239 - Pass the parent document's base URI when loading a srcdoc iframe. r=bz
Bug 964239 - Give sessionrestore awareness of srcdoc base URI. r=ttaubert
Bug 964239 - Check for special baseURI value for view-source:about:srcdoc. r=hsivonen
Bug 966878 - ARM Simulator: Increase the bit length of the instruction counter to 64 bits. r=jandem
Bug 968746 - Remove unused CanvasLayer::Data::mSurface. r=nical

Since no code path ever set CanvasLayer::Data::mSurface, remove the field
entirely
Bug 967443 - Upgrade SQLite to version 3.8.3 - SQLite changes. r=mak
Bug 967443 - Upgrade SQLite to version 3.8.3 - Mozilla changes. r=mak
Bug 967931 - Remove some unused forward declarations in XBL. r=bz
Bug 968234 - Remove trailing whitespace from nsHashtable.{h,cpp} rs=bsmedberg
Bug 907812 - define kProxyType_FOO as char[] rather than char*; r=jduell
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/e4222141d674
Author: Yuren Ju <yurenju@gmail.com>
Desc: Merge pull request #16066 from RickyChien/issue-969229

Bug 969229 - Incorrect unit tests in test-agent GUI r=@yurenju

========

https://hg.mozilla.org/integration/gaia-central/rev/22274cb3a0d0
Author: Ricky Chien <ricky060709@gmail.com>
Desc: Bug 969229 - Incorrect unit tests in test-agent GUI
Bumping manifests a=b2g-bump
Bug 968716 - avoid redundant operation for un-supported supp notification type. r=aknow
Bug 935525: Added NFC test infrastructure to build scripts, r=vyang,jgriffin
Bug 935525: Added Marionette test for turning NFC on and off, r=vyang