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


Trivial merge