[dali_1.4.24] Merge branch 'devel/master' 80/207980/1
authorAgnelo Vaz <agnelo.vaz@samsung.com>
Fri, 14 Jun 2019 10:38:02 +0000 (11:38 +0100)
committerAgnelo Vaz <agnelo.vaz@samsung.com>
Fri, 14 Jun 2019 10:38:02 +0000 (11:38 +0100)
Change-Id: I52e06a3200ade492f0e092608e1fce946982c5ea


Trivial merge