[dali_1.3.33] Merge branch 'devel/master' 29/184729/1
authorAngelos Gkountis <a.gkountis@samsung.com>
Fri, 20 Jul 2018 12:31:10 +0000 (13:31 +0100)
committerAngelos Gkountis <a.gkountis@samsung.com>
Fri, 20 Jul 2018 12:31:10 +0000 (13:31 +0100)
Change-Id: Id4b670e442cdf3bdd5dda74217cd098a3e0ae61c


Trivial merge