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


Trivial merge