[dali_1.4.26] Merge branch 'devel/master' 97/208797/1
authorgreynaga <g.reynaga@samsung.com>
Fri, 28 Jun 2019 10:43:40 +0000 (11:43 +0100)
committergreynaga <g.reynaga@samsung.com>
Fri, 28 Jun 2019 10:43:40 +0000 (11:43 +0100)
commit717e77e8b9d5ee6fe58a702e8ff3434618eb289f
treea68b4476802b42df92be891f9cec8ba372496aa7
parent9f226a58507f511c25b16494f49512bf3d79b36d
parent50b6ba43852e1301c52a091e076c5a3ae7b9e0c3
[dali_1.4.26] Merge branch 'devel/master'

Change-Id: I5367a119ef6de1360d0b272b1be333be16ea040c