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


Trivial merge