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


Trivial merge