[dali_1.9.4] Merge branch 'devel/master' 23/228323/1
authorVictor Cebollada <v.cebollada@samsung.com>
Fri, 20 Mar 2020 07:52:05 +0000 (07:52 +0000)
committerVictor Cebollada <v.cebollada@samsung.com>
Fri, 20 Mar 2020 07:52:05 +0000 (07:52 +0000)
Change-Id: I28fa6c600f3c00b82019c346c4748a1edd900e3c


Trivial merge