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


Trivial merge