[dali_1.3.47] Merge branch 'devel/master' 94/191994/1
authorgreynaga <g.reynaga@samsung.com>
Fri, 26 Oct 2018 11:25:01 +0000 (12:25 +0100)
committergreynaga <g.reynaga@samsung.com>
Fri, 26 Oct 2018 11:25:01 +0000 (12:25 +0100)
Change-Id: I100126f435a71d801903f9089385e64e44144e70


Trivial merge