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


Trivial merge