[dali_1.4.0] Merge branch 'devel/master' 98/196098/1
authorGyörgy Straub <g.straub@partner.samsung.com>
Fri, 21 Dec 2018 10:23:10 +0000 (10:23 +0000)
committerGyörgy Straub <g.straub@partner.samsung.com>
Fri, 21 Dec 2018 10:23:10 +0000 (10:23 +0000)
Change-Id: If653d2f42b4b222152dd07cbb84910dad2d9396d


Trivial merge