Merge branch 'chrome/m56' into update-m56
authorMatthew Leibowitz <mattleibow@live.com>
Fri, 18 Nov 2016 02:17:14 +0000 (04:17 +0200)
committerMatthew Leibowitz <mattleibow@live.com>
Fri, 18 Nov 2016 02:17:14 +0000 (04:17 +0200)
commit4c3f4c7878f3fc8809b1e6445b1e4c65b44b5a61
tree2afaf7853b91deb027e387553337d06b2d0727b8
parentc598c5f2b2dd7dbad48a2b576d6df6aaacc74309
parent0fe5f0978ded55c03792006560b1a8d2a6cca86c
Merge branch 'chrome/m56' into update-m56
 - there is something wrong since there are missing files...
bench/nanobench.cpp
dm/DM.cpp
gyp/common_conditions.gypi
gyp/core.gyp
gyp/effects.gyp
src/core/SkBlitter.cpp
src/core/SkScan_AntiPath.cpp
src/ports/SkFontMgr_win_dw.cpp
src/ports/SkRemotableFontMgr_win_dw.cpp
tools/flags/SkCommonFlags.cpp