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


Trivial merge