Merge "Changes following "Make TextureSet a non property owner"" into devel/master
authorPaul Wisbey <p.wisbey@samsung.com>
Wed, 27 Apr 2016 12:41:33 +0000 (05:41 -0700)
committerGerrit Code Review <gerrit@review.vlan103.tizen.org>
Wed, 27 Apr 2016 12:41:33 +0000 (05:41 -0700)

Trivial merge