[dali_1.9.4] Merge branch 'devel/master' 21/228321/1
authorVictor Cebollada <v.cebollada@samsung.com>
Fri, 20 Mar 2020 07:51:45 +0000 (07:51 +0000)
committerVictor Cebollada <v.cebollada@samsung.com>
Fri, 20 Mar 2020 07:51:45 +0000 (07:51 +0000)
Change-Id: Id3d546d0d5988b3cf7424d016f389af02ea22992


Trivial merge