Merge m-c to inbound.
commit6777d0901e18c89800e74dd3a871e702f2c79669
authorRyan VanderMeulen <ryanvm@gmail.com>
Fri, 22 Nov 2013 20:37:03 +0000 (22 15:37 -0500)
committerRyan VanderMeulen <ryanvm@gmail.com>
Fri, 22 Nov 2013 20:37:03 +0000 (22 15:37 -0500)
tree476fa6762edb3b0281897b8f2fe6545e2bcf2d59
parentca8f75f22de664a6ed518d5e4f3186f1cc9d6fae
parent6789e60ca8284f775e7be75e6531e0da4591ca81
Merge m-c to inbound.
gfx/layers/FrameMetrics.h
toolkit/xre/nsAppRunner.cpp