[dali_1.3.40] Merge branch 'devel/master' 75/188675/1
authorVictor Cebollada <v.cebollada@samsung.com>
Fri, 7 Sep 2018 07:32:29 +0000 (08:32 +0100)
committerVictor Cebollada <v.cebollada@samsung.com>
Fri, 7 Sep 2018 07:32:29 +0000 (08:32 +0100)
Change-Id: I1ba2184f5a574d04018a4fae21cbd4377da6e1dc


Trivial merge