[dali_1.4.6] Merge branch 'devel/master' 30/199330/1
authorAgnelo Vaz <agnelo.vaz@samsung.com>
Fri, 8 Feb 2019 12:15:58 +0000 (12:15 +0000)
committerAgnelo Vaz <agnelo.vaz@samsung.com>
Fri, 8 Feb 2019 12:15:58 +0000 (12:15 +0000)
Change-Id: I607cc7ccdce36303c972330d6d805b476e59db08


Trivial merge