[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)
commit2952b5c8a401751c0b12a169ac84aeaa56cf9e53
treeb6061cbe4700aaaa1f97f152d9dfe6a51cfdc0fa
parentc242bb57967a8537ceaab888b1ad70147e13a8a1
parent3e0687e0c4618275378b068c47bca101d61159ff
[dali_1.3.15] Merge branch 'devel/master'

Change-Id: I0665f9278e4f116fc4a286970daf1f5e97ba5869