[dali_1.4.29] Merge branch 'devel/master' 74/210474/1
authorVictor Cebollada <v.cebollada@samsung.com>
Fri, 19 Jul 2019 08:52:26 +0000 (09:52 +0100)
committerVictor Cebollada <v.cebollada@samsung.com>
Fri, 19 Jul 2019 08:52:26 +0000 (09:52 +0100)
Change-Id: I0cfcbb806080c67b5d22864e8ac9dd776004b53d


Trivial merge