[dali_1.2.51] Merge branch 'devel/master' 90/142590/1
authorgreynaga <g.reynaga@samsung.com>
Fri, 4 Aug 2017 10:44:10 +0000 (11:44 +0100)
committergreynaga <g.reynaga@samsung.com>
Fri, 4 Aug 2017 10:44:10 +0000 (11:44 +0100)
commita934e6dd80ae58faa43bb8c19bc9a0f50c38738b
treead776779bee84d98595543a344ac2f8ead3514c6
parentf17058692ef50453bbacf7ba4c682c1c5918559f
parentb3aae7fb3a23323463e5e0f76a72f4f520431dc6
[dali_1.2.51] Merge branch 'devel/master'

Change-Id: I57f7ce85e125514286a81840bef33e542beaaa75