[dali_1.4.17] Merge branch 'devel/master' 18/204818/1
authorgreynaga <g.reynaga@samsung.com>
Fri, 26 Apr 2019 12:53:21 +0000 (13:53 +0100)
committergreynaga <g.reynaga@samsung.com>
Fri, 26 Apr 2019 12:53:21 +0000 (13:53 +0100)
commit7ef2a73fc47a5e860de1986120d447a5ed4368d0
tree3f6006bc99c7b7dcddaa6c07c57ada26502aeb1c
parent2d5581786814ff1e098d2f0fd86224a780e40cd7
parent5b8ce18a4d5b9543bfe1fdbe1e42a5a217ada02d
[dali_1.4.17] Merge branch 'devel/master'

Change-Id: Ib6b5cb8e7c0f07ebc9cffbe1c94bf9a108918035