[dali_1.3.47] Merge branch 'devel/master' 91/191991/1
authorgreynaga <g.reynaga@samsung.com>
Fri, 26 Oct 2018 11:24:32 +0000 (12:24 +0100)
committergreynaga <g.reynaga@samsung.com>
Fri, 26 Oct 2018 11:24:32 +0000 (12:24 +0100)
Change-Id: I5c95e0d889ce4c16bffcb24a8dade86633d0be30


Trivial merge