[dali_1.3.5] Merge branch 'devel/master' 43/165043/1
authorGyörgy Straub <g.straub@partner.samsung.com>
Fri, 22 Dec 2017 14:19:28 +0000 (14:19 +0000)
committerGyörgy Straub <g.straub@partner.samsung.com>
Fri, 22 Dec 2017 14:19:28 +0000 (14:19 +0000)
Change-Id: I08c3ea73f785a0d30ae18d7c7a1ac8c767bd0d55


Trivial merge