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


Trivial merge