[dali_1.3.29] Merge branch 'devel/master' 67/182367/1
authorVictor Cebollada <v.cebollada@samsung.com>
Fri, 22 Jun 2018 07:56:19 +0000 (08:56 +0100)
committerVictor Cebollada <v.cebollada@samsung.com>
Fri, 22 Jun 2018 07:56:19 +0000 (08:56 +0100)
Change-Id: Ic4a5e0257bd20fcfd39ee11f740b06ef308eeff2


Trivial merge