[dali_1.3.5] Merge branch 'devel/master' 44/165044/1
authorGyörgy Straub <g.straub@partner.samsung.com>
Fri, 22 Dec 2017 14:19:43 +0000 (14:19 +0000)
committerGyörgy Straub <g.straub@partner.samsung.com>
Fri, 22 Dec 2017 14:19:43 +0000 (14:19 +0000)
Change-Id: I2e44697633554b9e6d97611d02cb96228b5cf29f


Trivial merge