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


Trivial merge