[dali_1.3.28] Merge branch 'devel/master' 42/181142/1
authorGyörgy Straub <g.straub@partner.samsung.com>
Fri, 8 Jun 2018 10:50:47 +0000 (11:50 +0100)
committerGyörgy Straub <g.straub@partner.samsung.com>
Fri, 8 Jun 2018 10:50:47 +0000 (11:50 +0100)
Change-Id: I9534d699dd22b11d4ee163591e6e0f9850621330


Trivial merge