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


Trivial merge