[dali_1.3.15] Merge branch 'devel/master' 86/172086/1
authorgreynaga <g.reynaga@samsung.com>
Fri, 9 Mar 2018 14:13:12 +0000 (14:13 +0000)
committergreynaga <g.reynaga@samsung.com>
Fri, 9 Mar 2018 14:13:12 +0000 (14:13 +0000)
Change-Id: Ia3339e0e4f750a4cea7616853210685c033a1ae8


Trivial merge