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


Trivial merge