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


Trivial merge