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


Trivial merge