[dali_1.2.61] Merge branch 'devel/master' 70/155570/1
authorgreynaga <g.reynaga@samsung.com>
Fri, 13 Oct 2017 14:00:55 +0000 (15:00 +0100)
committergreynaga <g.reynaga@samsung.com>
Fri, 13 Oct 2017 14:00:55 +0000 (15:00 +0100)
commit9879c76252b384906ea35422547840350a72019c
tree9f8998a2964df802ba8135b6c4cc22d636a9171a
parent8b8df4bd98ecbf5226c2f06d477aec784d326860
parentec2a76353b3358a70681038144d898cf177994a2
[dali_1.2.61] Merge branch 'devel/master'

Change-Id: I160a9cde85c40723834dea23fdf0288a672c629c