[dali_1.4.13] Merge branch 'devel/master' 98/202498/1
authorVictor Cebollada <v.cebollada@samsung.com>
Fri, 29 Mar 2019 07:07:38 +0000 (07:07 +0000)
committerVictor Cebollada <v.cebollada@samsung.com>
Fri, 29 Mar 2019 07:07:38 +0000 (07:07 +0000)
Change-Id: I2c09b4fad7e2e1da08ebe46bfd54b724a0522a5c


Trivial merge