[dali_1.4.21] Merge branch 'devel/master' 45/206745/1
authorVictor Cebollada <v.cebollada@samsung.com>
Fri, 24 May 2019 06:07:54 +0000 (07:07 +0100)
committerVictor Cebollada <v.cebollada@samsung.com>
Fri, 24 May 2019 06:07:54 +0000 (07:07 +0100)
Change-Id: I392b5079ac8b99bc4a3b84b82804ea8d5f64fc9c


Trivial merge