Bug 922942 - Use Moz2D for android snapshots. r=roc
Bug 922942 - Use Moz2D for canvas snapshots when the canvas and content backends don't match. r=roc
Bug 922942 - Clean up some no longer used ShadowLayers code from BasicLayers. r=roc
Bug 922942 - Add a Validate() pass to BasicLayers to avoid needing to create a dummy destination context. r=roc
Bug 926258 - Remove gfxFlattenedPath as it doesn't match the abstraction we want for Moz2D. r=roc
Bug 926258 - Implement a Moz2D version of gfxPath. r=Bas
Backed out changeset b83bf0fa7adc (bug 924724)
Bug 920170 - Break out some pieces of prompts into their own methods. r=margaret
Bug 923391 - Prompts should return values even if they're cancelled. r=mfinkle
merge b2g-inbound to mozilla-central
Merge mozilla-central to fx-team
Bug 914294 - Don't throw exceptions from the history result end batch macro to retain backwards compatibility.
r=mano
Make property descriptor tooltips easier to read on Linux (bug 926397). r=paul,msucan
Bug 930583 - Stop #including nsEventStateManager in nsWindowRoot.h and nsDocument.h; r=smaug
Bug 928736 - Remove forward declarations of classes subsequently defined with attributes, because clang doesn't like it when you do this, and add JS:: to the few places that now need it.  r=benjamin

--HG--
extra : amend_source : 103b55a665c89b2cc1fddf100b9ec91a8f34efd6
Bug 924696: Expose count of createObjectURL'ed blobs in about:memory. r=njn
Bug 929910 - Update libvorbis to the 1.3.3 release. r=xiphmont

Note that bug 722924 is fixed in a different way upstream.
This commit takes their subsequent patch over ours.
[PATCH] bug 922566 - kill dom-config.mk

From 6681eaa8bb47ddb4756fd71738771c4c437101c0 Mon Sep 17 00:00:00 2001
---
 content/media/webspeech/recognition/Makefile.in |  1 -
 content/media/webspeech/recognition/moz.build   |  5 +-
 content/media/webspeech/synth/Makefile.in       |  1 -
 content/media/webspeech/synth/pico/Makefile.in  |  3 --
 dom/alarm/Makefile.in                           |  2 -
 dom/apps/src/Makefile.in                        |  1 -
 dom/base/Makefile.in                            |  2 -
 dom/base/moz.build                              | 26 ++++++++++-
 dom/battery/Makefile.in                         |  1 -
 dom/bindings/Makefile.in                        |  3 --
 dom/bindings/moz.build                          | 17 ++++++-
 dom/bindings/test/Makefile.in                   |  5 +-
 dom/bluetooth/Makefile.in                       |  2 -
 dom/bluetooth/moz.build                         |  7 ++-
 dom/browser-element/Makefile.in                 |  3 --
 dom/browser-element/moz.build                   |  6 ++-
 dom/camera/Makefile.in                          |  1 -
 dom/camera/moz.build                            |  5 +-
 dom/devicestorage/Makefile.in                   |  1 -
 dom/dom-config.mk                               | 61 -------------------------
 dom/encoding/Makefile.in                        |  1 -
 dom/fmradio/Makefile.in                         |  2 -
 dom/fmradio/ipc/Makefile.in                     |  1 -
 dom/fmradio/ipc/moz.build                       |  5 +-
 dom/fmradio/moz.build                           |  5 +-
 dom/icc/src/Makefile.in                         |  4 --
 dom/media/Makefile.in                           |  3 --
 dom/media/moz.build                             |  6 ++-
 dom/mobilemessage/src/Makefile.in               |  1 -
 dom/mobilemessage/src/moz.build                 |  5 +-
 dom/network/src/Makefile.in                     |  2 -
 dom/plugins/base/Makefile.in                    |  1 -
 dom/plugins/base/moz.build                      |  8 +++-
 dom/power/Makefile.in                           |  1 -
 dom/quota/Makefile.in                           |  1 -
 dom/system/gonk/Makefile.in                     |  2 -
 dom/telephony/Makefile.in                       |  1 -
 dom/time/Makefile.in                            |  1 -
 dom/wifi/Makefile.in                            |  5 --
 39 files changed, 85 insertions(+), 123 deletions(-)
 delete mode 100644 dom/dom-config.mk
 delete mode 100644 dom/wifi/Makefile.in
Bug 928542 - Add placeholder CallGetProperty ops in definite properties analysis to avoid folding uses of 'this', r=jandem.
Bug 929667 - Mirror mozprocess,mozrunner, r=ahal