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


Trivial merge