Merge "Fixing bug with changing a shader on a renderer" into devel/master
authorAdeel Kazmi <adeel.kazmi@samsung.com>
Wed, 4 Apr 2018 14:07:44 +0000 (14:07 +0000)
committerGerrit Code Review <gerrit@review.ap-northeast-2.compute.internal>
Wed, 4 Apr 2018 14:07:44 +0000 (14:07 +0000)

Trivial merge