[dali_1.4.38] Merge branch 'devel/master' 14/214314/1
authorVictor Cebollada <v.cebollada@samsung.com>
Fri, 20 Sep 2019 06:25:24 +0000 (07:25 +0100)
committerVictor Cebollada <v.cebollada@samsung.com>
Fri, 20 Sep 2019 06:25:24 +0000 (07:25 +0100)
Change-Id: I0e38e0aaf12a95ec85dea0fb0ef34bed8bff934b


Trivial merge