Merge branch 'chrome/m49' into xamarin-mobile-bindings
authorMatthew Leibowitz <mattleibow@live.com>
Wed, 3 Feb 2016 21:33:30 +0000 (23:33 +0200)
committerMatthew Leibowitz <mattleibow@live.com>
Wed, 3 Feb 2016 21:33:30 +0000 (23:33 +0200)
commit6df19713ae762a9917090a0f37f030819b09efc2
treeb12169b206f7f67ae6f542d68046b7d31f40e921
parent5234c7ad5a1ba72a61bef48bf2dc87cfacba8f6c
parent565378f7b1d088aa34216c318c83bff5b9075675
Merge branch 'chrome/m49' into xamarin-mobile-bindings
gyp/common_conditions.gypi
gyp/core.gypi
include/core/SkPreConfig.h
include/effects/SkDropShadowImageFilter.h
tools/BUILD.public.expected