[dali_1.3.18] Merge branch 'devel/master' 80/174280/1
authorGyörgy Straub <g.straub@partner.samsung.com>
Thu, 29 Mar 2018 13:04:06 +0000 (14:04 +0100)
committerGyörgy Straub <g.straub@partner.samsung.com>
Thu, 29 Mar 2018 13:04:06 +0000 (14:04 +0100)
Change-Id: I1f677704d6c2cca3ca8b5c93fc470c04f7f2851c


Trivial merge