[dali_1.2.22] Merge branch 'devel/master' 95/110295/1
authorDavid Steele <david.steele@samsung.com>
Fri, 13 Jan 2017 14:36:09 +0000 (14:36 +0000)
committerDavid Steele <david.steele@samsung.com>
Fri, 13 Jan 2017 14:36:09 +0000 (14:36 +0000)
commit91af0cc703d9082c9fac18f6e2afb1863f9878f2
treef9766d583199004e0888b764d9ae0ab542c11e67
parent1028ae1632a247b01d29d6f55f1a0c7b1635dbfe
parentebcd8fe9df28abbb093597a65bbaf7f06fffe130
[dali_1.2.22] Merge branch 'devel/master'

Change-Id: I988e33d37756c6d78b6a0acaac79c2b3b8950d72