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


Trivial merge