Merge "Removed need for sampler uniform names" into devel/master
authorAdeel Kazmi <adeel.kazmi@samsung.com>
Mon, 4 Apr 2016 10:51:38 +0000 (03:51 -0700)
committerGerrit Code Review <gerrit@review.vlan103.tizen.org>
Mon, 4 Apr 2016 10:51:38 +0000 (03:51 -0700)

Trivial merge