[dali_1.3.5] Merge branch 'devel/master' 46/165046/1
authorGyörgy Straub <g.straub@partner.samsung.com>
Fri, 22 Dec 2017 14:20:05 +0000 (14:20 +0000)
committerGyörgy Straub <g.straub@partner.samsung.com>
Fri, 22 Dec 2017 14:20:05 +0000 (14:20 +0000)
Change-Id: I0c7ad83a255f66599b11bbb25768bc5d5b54f47d


Trivial merge