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


Trivial merge