[dali_1.3.15] Merge branch 'devel/master' 85/172085/1
authorgreynaga <g.reynaga@samsung.com>
Fri, 9 Mar 2018 14:12:46 +0000 (14:12 +0000)
committergreynaga <g.reynaga@samsung.com>
Fri, 9 Mar 2018 14:12:46 +0000 (14:12 +0000)
commit6233326e85cf96f051ae75f7ce778ef28474894c
tree2e2f7942cde2a3ee7b19ccf0673c28d8042cf6c8
parent165e181f7489fb33505bacfb19775703112296a5
parent4f52f1fd856d07c00c657f56a117f690cbe76728
[dali_1.3.15] Merge branch 'devel/master'

Change-Id: Ia382be6be23de98a5e152500fc60236b3b71372f