Merge mozilla-beta to b2g37. a=merge
commitde066d8c423190a3326fb7331c8cac80ae8fbc66
authorRyan VanderMeulen <ryanvm@gmail.com>
Tue, 3 Mar 2015 01:24:06 +0000 (2 20:24 -0500)
committerRyan VanderMeulen <ryanvm@gmail.com>
Tue, 3 Mar 2015 01:24:06 +0000 (2 20:24 -0500)
tree3917258c5c54e415168405732ca0973bfab1ae8f
parente0fc665f312a7d320e1b240b01263b247cbc6e39
parent34857ec04c84134acca9fc003b88f2c916f311f1
Merge mozilla-beta to b2g37. a=merge
layout/base/FrameLayerBuilder.cpp
layout/base/nsDisplayList.cpp
layout/base/nsDisplayList.h
layout/base/nsDisplayListInvalidation.cpp
layout/base/nsDisplayListInvalidation.h
modules/libpref/init/all.js