[dali_1.3.43] Merge branch 'devel/master' 68/190268/1
authorAgnelo Vaz <agnelo.vaz@samsung.com>
Fri, 28 Sep 2018 13:05:53 +0000 (14:05 +0100)
committerAgnelo Vaz <agnelo.vaz@samsung.com>
Fri, 28 Sep 2018 13:05:53 +0000 (14:05 +0100)
Change-Id: Ia7756a5a96032447e214cbaf75f3806afc487ece


Trivial merge