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


Trivial merge