[dali_1.2.58] Merge branch 'devel/master' 85/151985/1
authorDavid Steele <david.steele@samsung.com>
Fri, 22 Sep 2017 14:24:47 +0000 (15:24 +0100)
committerDavid Steele <david.steele@samsung.com>
Fri, 22 Sep 2017 14:24:47 +0000 (15:24 +0100)
commit45ee15fa0cf9e522ac0072c5d35596dfdda59561
treeeee5a03f81307a3794f470d1b0962eabcd24a5af
parent73b9e0adcc530bdef14669fe6ee318a4169aaf5b
parentc46c289525c8d19e239eb068f199f711d2eaae6f
[dali_1.2.58] Merge branch 'devel/master'

Change-Id: I6f90d9f3fdf65d10e004df91ca1bef31d7344cba