Bug 1048277 - Fix selector for hiding about:neterror icon when content area is sufficiently small. r=Unfocused
Bug 1048356 - Add missing <script src="enableTestPlugin.js"> tag to {file_fullscreen-,test_iframe_sandbox_}plugins.html. r=Ms2ger
Bug 1048622 - Fix 'assignment to undefined variable' warnings in nsBrowserContentHandler.js. r=gavin
Backed out changeset 3d47686129ae (bug 1048252) because of build bustage

--HG--
extra : rebase_source : 727e289f47bfc9b1164914edeaf1eddba644cb0d
Bug 1044773 - the window can be null when AudioChannelAgent is created, r=roc
Bug 1013064 (part 1) - prompt for master-password unlock when interacting with about:accounts. r=ttaubert

From 18f9d132020afee6004e63c9006245e4d3b04e18 Mon Sep 17 00:00:00 2001
---
 browser/base/content/aboutaccounts/aboutaccounts.js | 9 +++++++++
 1 file changed, 9 insertions(+)
Bug 1013064 (part 2) - Store sensitive FxA credentials in the login manager. r=ckarlof,dveditz

From 4a92f9ee1ba35989f82a24bba18806f8616a5be8 Mon Sep 17 00:00:00 2001
---
 services/fxaccounts/FxAccounts.jsm                 | 170 ++++++++++++++++++
 services/fxaccounts/FxAccountsCommon.js            |  13 ++
 services/fxaccounts/moz.build                      |   5 +-
 .../tests/xpcshell/test_loginmgr_storage.js        | 196 +++++++++++++++++++++
 services/fxaccounts/tests/xpcshell/xpcshell.ini    |   2 +
 services/sync/modules/util.js                      |  12 +-
 6 files changed, 396 insertions(+), 2 deletions(-)
 create mode 100644 services/fxaccounts/tests/xpcshell/test_loginmgr_storage.js
Bug 1013064 (part 3) - only migrate data into the loginmgr when it is unlocked. r=ckarlof

From 86c67f9b9081ce905442c86b38575b3422c8dce3 Mon Sep 17 00:00:00 2001
---
 services/fxaccounts/FxAccounts.jsm                 |  25 ++++-
 .../tests/xpcshell/test_loginmgr_storage.js        | 113 +++++++++++++++++++++
 2 files changed, 137 insertions(+), 1 deletion(-)
Bug 1013064 (part 4) - browserid_identity and sync changes to support FxA credentials in the login manager. r=ckarlof,rnewman

From 9717484083e66b78eedfa14e539d51382aba760f Mon Sep 17 00:00:00 2001
---
 services/sync/modules/browserid_identity.js        | 61 ++++++++++++++++++++--
 services/sync/modules/identity.js                  | 19 +++++++
 services/sync/modules/service.js                   | 20 ++++---
 .../sync/tests/unit/test_browserid_identity.js     | 15 ++++++
 4 files changed, 102 insertions(+), 13 deletions(-)
Bug 1013064 (part 5) - stop disabling the password engine when MP enabled. r=ttaubert

From 07aa9cc1fcd5479976effe29f6adf5ad5ba7a8f8 Mon Sep 17 00:00:00 2001
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/f4b0b276eb8f
Author: Timothy Guan-tin Chien <timdream@gmail.com>
Desc: Merge pull request #22461 from timdream/keyboard-vwrapper-css

Bug 1048025 - Set pointer-events: none to visual-wrapper, r=rudyl

========

https://hg.mozilla.org/integration/gaia-central/rev/0d72a2159857
Author: Timothy Guan-tin Chien <timdream@gmail.com>
Desc: Bug 1048025 - Set pointer-events: none to visual-wrapper
Bumping manifests a=b2g-bump
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/5ac5df7f279b
Author: evelynhung <jj.evelyn@gmail.com>
Desc: Merge pull request #22382 from crh0716/1046068

Bug 1046068 - Add the default value for mms delivery report

========

https://hg.mozilla.org/integration/gaia-central/rev/12f299ead266
Author: Arthur Chen <crh0716@gmail.com>
Desc: Bug 1046068 - Add the default value for mms delivery report
Bumping manifests a=b2g-bump
Bug 916607 - 1/4: Convert MozSmsSegmentInfo to WebIDL dictionary. Interface changes. r=bzbarsky, r=khuey
Bug 916607 - 2/4: implementation. r=bzbarsky, r=gene
Bug 916607 - 3/4: android backend. r=blassey
Bug 916607 - 4/4: fix test cases. r=bzbarsky, r=gene
Bumping gaia.json for 4 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/15a76be03f01
Author: Timothy Guan-tin Chien <timdream@gmail.com>
Desc: Merge pull request #22470 from timdream/keyboard-latin-new-uint8

Bug 1048135 - Add new keyword on Uint8Array instance creation, r=rudyl

========

https://hg.mozilla.org/integration/gaia-central/rev/d5235d201196
Author: Timothy Guan-tin Chien <timdream@gmail.com>
Desc: Bug 1048135 - Add new keyword on Uint8Array instance creation

========

https://hg.mozilla.org/integration/gaia-central/rev/17de4b2606e5
Author: Timothy Guan-tin Chien <timdream@gmail.com>
Desc: Merge pull request #22474 from mozilla-b2g/revert-22461-keyboard-vwrapper-css

Revert "Bug 1048025 - Set pointer-events: none to visual-wrapper"

========

https://hg.mozilla.org/integration/gaia-central/rev/0ceb9239e8b2
Author: Timothy Guan-tin Chien <timdream@gmail.com>
Desc: Revert "Bug 1048025 - Set pointer-events: none to visual-wrapper +shepherd"
Bumping manifests a=b2g-bump