[dali_1.4.50] Merge branch 'devel/master' 60/220160/1
authorAgnelo Vaz <agnelo.vaz@samsung.com>
Fri, 13 Dec 2019 10:58:43 +0000 (10:58 +0000)
committerAgnelo Vaz <agnelo.vaz@samsung.com>
Fri, 13 Dec 2019 10:58:43 +0000 (10:58 +0000)
Change-Id: I95062327b4a1b52181bedc8ad9e10cc2a561d36b


Trivial merge