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


Trivial merge