[dali_1.3.29] Merge branch 'devel/master' 64/182364/1
authorVictor Cebollada <v.cebollada@samsung.com>
Fri, 22 Jun 2018 07:55:39 +0000 (08:55 +0100)
committerVictor Cebollada <v.cebollada@samsung.com>
Fri, 22 Jun 2018 07:55:39 +0000 (08:55 +0100)
Change-Id: I4733b7e948da969612e23500e30b6d791ee392cf


Trivial merge