Merge mozilla-beta to b2g37. a=merge
commit0dce0bd8533437f8e9600587c87fbcb4b4d3c41b
authorRyan VanderMeulen <ryanvm@gmail.com>
Fri, 20 Mar 2015 02:20:28 +0000 (19 22:20 -0400)
committerRyan VanderMeulen <ryanvm@gmail.com>
Fri, 20 Mar 2015 02:20:28 +0000 (19 22:20 -0400)
tree4746f9ed240ac685b8088ff8d365536827cf2fb4
parentca79e678c480e43ec932210b88fede02a0eb8620
parent7d4d80f66239d6485f598afb062a5584a86a0f4f
Merge mozilla-beta to b2g37. a=merge
docshell/base/nsDocShell.cpp
docshell/base/nsDocShell.h
gfx/layers/moz.build
layout/base/nsRefreshDriver.cpp
widget/nsBaseWidget.cpp
widget/nsBaseWidget.h