Merge branch 'chrome/m53' into update-skia-m52
authorMatthew Leibowitz <mattleibow@live.com>
Mon, 18 Jul 2016 21:06:14 +0000 (23:06 +0200)
committerMatthew Leibowitz <mattleibow@live.com>
Mon, 18 Jul 2016 21:06:14 +0000 (23:06 +0200)
commit212081248edae8d3e7f594aa270c63bea4d0631f
tree1ad6add015a4d88804be9b0b7dc380af607bcef3
parent85b8b4e169657b861250f2f262cfdecfaea9daf9
parent74fa05791bddf1c0a58373b6006cbaa4bd44a2c0
Merge branch 'chrome/m53' into update-skia-m52

# Conflicts:
# gyp/common_conditions.gypi
# gyp/dng_sdk.gyp
# include/core/SkPreConfig.h
# src/gpu/gl/GrGLGpu.cpp
# src/gpu/text/GrAtlasTextBlob_regenInBatch.cpp
# tests/PathOpsBuilderTest.cpp
gyp/common_conditions.gypi
gyp/core.gypi
include/core/SkPreConfig.h
src/ports/SkFontMgr_win_dw.cpp
src/ports/SkOSFile_win.cpp
src/ports/SkOSLibrary_win.cpp
src/ports/SkTLS_win.cpp