Correcting merge issues
authorMatthew Leibowitz <mattleibow@live.com>
Sat, 6 May 2017 15:48:57 +0000 (11:48 -0400)
committerMatthew Leibowitz <mattleibow@live.com>
Sat, 6 May 2017 15:48:57 +0000 (11:48 -0400)
commit33f884c42c8b6b72609ee8d02428d5d4700cbb32
treea7f8d63391d3d42ded1069784066a70564647ed8
parentea9ce4fea20ba8a6a0623724bf60b308147cbbd3
Correcting merge issues
src/core/SkImageInfoPriv.h
tests/RegionTest.cpp