[dali_1.3.25] Merge branch 'devel/master' 38/179538/1
authorgreynaga <g.reynaga@samsung.com>
Fri, 18 May 2018 11:04:39 +0000 (12:04 +0100)
committergreynaga <g.reynaga@samsung.com>
Fri, 18 May 2018 11:04:39 +0000 (12:04 +0100)
Change-Id: I53f91b370689c8944e6ca521822f66cfd4f32b31


Trivial merge