[dali_1.3.36] Merge branch 'devel/master' 56/186556/1
authorGyörgy Straub <g.straub@partner.samsung.com>
Fri, 10 Aug 2018 09:11:45 +0000 (10:11 +0100)
committerGyörgy Straub <g.straub@partner.samsung.com>
Fri, 10 Aug 2018 09:11:45 +0000 (10:11 +0100)
Change-Id: I28a468fc61cef403ee6a620d636518dc8bb56b4a


Trivial merge